-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
a4d38f9
commit c9b442f
Showing
8 changed files
with
751 additions
and
678 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,27 @@ | ||
| { | ||
| "name": "zendframework/skeleton-application", | ||
| "description": "Skeleton Application for ZF2", | ||
| "license": "BSD-3-Clause", | ||
| "keywords": [ | ||
| "framework", | ||
| "zf2" | ||
| ], | ||
| "homepage": "http://framework.zend.com/", | ||
| "require": { | ||
| "php": ">=5.3.3", | ||
| "zendframework/zendframework": "2.2.*", | ||
| "zf-commons/zfc-user": "dev-master", | ||
| "hybridauth/hybridauth": "dev-master", | ||
| "socalnick/scn-social-auth": "dev-master" | ||
|
|
||
| }, | ||
| "autoload": { | ||
| "classmap": [ | ||
| "./vendor/hybridauth/hybridauth/additional-providers" | ||
| ] | ||
| } | ||
| } | ||
| { | ||
| "name": "zendframework/skeleton-application", | ||
| "description": "Skeleton Application for ZF2", | ||
| "license": "BSD-3-Clause", | ||
| "keywords": [ | ||
| "framework", | ||
| "zf2" | ||
| ], | ||
| "homepage": "http://framework.zend.com/", | ||
| "require": { | ||
| "php": ">=5.3.3", | ||
| "zendframework/zendframework": "2.2.*", | ||
| "zf-commons/zfc-user": "dev-master", | ||
| "doctrine/doctrine-module": "0.*", | ||
| "doctrine/doctrine-orm-module": "0.*", | ||
| "doctrine/common": "dev-master", | ||
| "doctrine/orm": "dev-master", | ||
| "hybridauth/hybridauth": "dev-master", | ||
| "socalnick/scn-social-auth": "dev-master" | ||
|
|
||
| }, | ||
| "autoload": { | ||
| "classmap": [ | ||
| "./vendor/hybridauth/hybridauth/additional-providers" | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,70 +1,72 @@ | ||
| <?php | ||
| return array( | ||
| // This should be an array of module namespaces used in the application. | ||
| 'modules' => array( | ||
| 'Application', | ||
| 'ScnSocialAuth', | ||
| 'ZfcBase', | ||
| 'ZfcUser', | ||
|
|
||
| // | ||
| 'Secret', | ||
| ), | ||
|
|
||
| // These are various options for the listeners attached to the ModuleManager | ||
| 'module_listener_options' => array( | ||
| // This should be an array of paths in which modules reside. | ||
| // If a string key is provided, the listener will consider that a module | ||
| // namespace, the value of that key the specific path to that module's | ||
| // Module class. | ||
| 'module_paths' => array( | ||
| './module', | ||
| './vendor', | ||
| ), | ||
|
|
||
| // An array of paths from which to glob configuration files after | ||
| // modules are loaded. These effectively override configuration | ||
| // provided by modules themselves. Paths may use GLOB_BRACE notation. | ||
| 'config_glob_paths' => array( | ||
| 'config/autoload/{,*.}{global,local}.php', | ||
| ), | ||
|
|
||
| // Whether or not to enable a configuration cache. | ||
| // If enabled, the merged configuration will be cached and used in | ||
| // subsequent requests. | ||
| //'config_cache_enabled' => $booleanValue, | ||
|
|
||
| // The key used to create the configuration cache file name. | ||
| //'config_cache_key' => $stringKey, | ||
|
|
||
| // Whether or not to enable a module class map cache. | ||
| // If enabled, creates a module class map cache which will be used | ||
| // by in future requests, to reduce the autoloading process. | ||
| //'module_map_cache_enabled' => $booleanValue, | ||
|
|
||
| // The key used to create the class map cache file name. | ||
| //'module_map_cache_key' => $stringKey, | ||
|
|
||
| // The path in which to cache merged configuration. | ||
| //'cache_dir' => $stringPath, | ||
|
|
||
| // Whether or not to enable modules dependency checking. | ||
| // Enabled by default, prevents usage of modules that depend on other modules | ||
| // that weren't loaded. | ||
| // 'check_dependencies' => true, | ||
| ), | ||
|
|
||
| // Used to create an own service manager. May contain one or more child arrays. | ||
| //'service_listener_options' => array( | ||
| // array( | ||
| // 'service_manager' => $stringServiceManagerName, | ||
| // 'config_key' => $stringConfigKey, | ||
| // 'interface' => $stringOptionalInterface, | ||
| // 'method' => $stringRequiredMethodName, | ||
| // ), | ||
| // ) | ||
|
|
||
| // Initial configuration with which to seed the ServiceManager. | ||
| // Should be compatible with Zend\ServiceManager\Config. | ||
| // 'service_manager' => array(), | ||
| ); | ||
| <?php | ||
| return array( | ||
| // This should be an array of module namespaces used in the application. | ||
| 'modules' => array( | ||
| 'Application', | ||
| 'ZfcBase', | ||
| 'ZfcUser', | ||
| 'DoctrineModule', | ||
| 'DoctrineORMModule', | ||
| 'ScnSocialAuth', | ||
|
|
||
| // | ||
| 'Secret', | ||
| ), | ||
|
|
||
| // These are various options for the listeners attached to the ModuleManager | ||
| 'module_listener_options' => array( | ||
| // This should be an array of paths in which modules reside. | ||
| // If a string key is provided, the listener will consider that a module | ||
| // namespace, the value of that key the specific path to that module's | ||
| // Module class. | ||
| 'module_paths' => array( | ||
| './module', | ||
| './vendor', | ||
| ), | ||
|
|
||
| // An array of paths from which to glob configuration files after | ||
| // modules are loaded. These effectively override configuration | ||
| // provided by modules themselves. Paths may use GLOB_BRACE notation. | ||
| 'config_glob_paths' => array( | ||
| 'config/autoload/{,*.}{global,local}.php', | ||
| ), | ||
|
|
||
| // Whether or not to enable a configuration cache. | ||
| // If enabled, the merged configuration will be cached and used in | ||
| // subsequent requests. | ||
| //'config_cache_enabled' => $booleanValue, | ||
|
|
||
| // The key used to create the configuration cache file name. | ||
| //'config_cache_key' => $stringKey, | ||
|
|
||
| // Whether or not to enable a module class map cache. | ||
| // If enabled, creates a module class map cache which will be used | ||
| // by in future requests, to reduce the autoloading process. | ||
| //'module_map_cache_enabled' => $booleanValue, | ||
|
|
||
| // The key used to create the class map cache file name. | ||
| //'module_map_cache_key' => $stringKey, | ||
|
|
||
| // The path in which to cache merged configuration. | ||
| //'cache_dir' => $stringPath, | ||
|
|
||
| // Whether or not to enable modules dependency checking. | ||
| // Enabled by default, prevents usage of modules that depend on other modules | ||
| // that weren't loaded. | ||
| // 'check_dependencies' => true, | ||
| ), | ||
|
|
||
| // Used to create an own service manager. May contain one or more child arrays. | ||
| //'service_listener_options' => array( | ||
| // array( | ||
| // 'service_manager' => $stringServiceManagerName, | ||
| // 'config_key' => $stringConfigKey, | ||
| // 'interface' => $stringOptionalInterface, | ||
| // 'method' => $stringRequiredMethodName, | ||
| // ), | ||
| // ) | ||
|
|
||
| // Initial configuration with which to seed the ServiceManager. | ||
| // Should be compatible with Zend\ServiceManager\Config. | ||
| // 'service_manager' => array(), | ||
| ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,3 @@ | ||
| <div class="jumbotron"> | ||
| <h1><?php echo sprintf($this->translate('Welcome to %sZend Framework 2%s'), '<span class="zf-green">', '</span>') ?></h1> | ||
| <p><?php echo sprintf($this->translate('Congratulations! You have successfully installed the %sZF2 Skeleton Application%s. You are currently running Zend Framework version %s. This skeleton can serve as a simple starting point for you to begin building your application on ZF2.'), '<a href="https://github.com/zendframework/ZendSkeletonApplication" target="_blank">', '</a>', \Zend\Version\Version::VERSION) ?></p> | ||
| <p><a class="btn btn-success btn-lg" href="https://github.com/zendframework/zf2" target="_blank"><?php echo $this->translate('Fork Zend Framework 2 on GitHub') ?> »</a></p> | ||
| </div> | ||
|
|
||
| <div class="row"> | ||
|
|
||
| <div class="col-md-4"> | ||
| <div class="panel panel-default"> | ||
| <div class="panel-heading"> | ||
| <h3 class="panel-title"><?php echo $this->translate('Follow Development') ?></h3> | ||
| </div> | ||
| <div class="panel-body"> | ||
| <p><?php echo sprintf($this->translate('Zend Framework 2 is under active development. If you are interested in following the development of ZF2, there is a special ZF2 portal on the official Zend Framework website which provides links to the ZF2 %swiki%s, %sdev blog%s, %sissue tracker%s, and much more. This is a great resource for staying up to date with the latest developments!'), '<a href="http://framework.zend.com/wiki/display/ZFDEV2/Home">', '</a>', '<a href="http://framework.zend.com/zf2/blog">', '</a>', '<a href="https://github.com/zendframework/zf2/issues">', '</a>') ?></p> | ||
| <p><a class="btn btn-success pull-right" href="http://framework.zend.com/zf2" target="_blank"><?php echo $this->translate('ZF2 Development Portal') ?> »</a></p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="col-md-4"> | ||
| <div class="panel panel-default"> | ||
| <div class="panel-heading"> | ||
| <h3 class="panel-title"><?php echo $this->translate('Discover Modules') ?></h3> | ||
| </div> | ||
| <div class="panel-body"> | ||
| <p><?php echo sprintf($this->translate('The community is working on developing a community site to serve as a repository and gallery for ZF2 modules. The project is available %son GitHub%s. The site is currently live and currently contains a list of some of the modules already available for ZF2.'), '<a href="https://github.com/zendframework/modules.zendframework.com">', '</a>') ?></p> | ||
| <p><a class="btn btn-success pull-right" href="http://modules.zendframework.com/" target="_blank"><?php echo $this->translate('Explore ZF2 Modules') ?> »</a></p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="col-md-4"> | ||
| <div class="panel panel-default"> | ||
| <div class="panel-heading"> | ||
| <h3 class="panel-title"><?php echo $this->translate('Help & Support') ?></h3> | ||
| </div> | ||
| <div class="panel-body"> | ||
| <p><?php echo sprintf($this->translate('If you need any help or support while developing with ZF2, you may reach us via IRC: %s#zftalk on Freenode%s. We\'d love to hear any questions or feedback you may have regarding the beta releases. Alternatively, you may subscribe and post questions to the %smailing lists%s.'), '<a href="irc://irc.freenode.net/zftalk">', '</a>', '<a href="http://framework.zend.com/wiki/display/ZFDEV/Mailing+Lists">', '</a>') ?></p> | ||
| <p><a class="btn btn-success pull-right" href="http://webchat.freenode.net?channels=zftalk" target="_blank"><?php echo $this->translate('Ping us on IRC') ?> »</a></p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
|
|
||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,9 @@ | ||
| <?php if ($this->zfcUserIdentity()) : ?> | ||
| <strong>Module:</strong> Secret » | ||
| <strong>Controller:</strong> Main » | ||
| <strong>Action:</strong> index | ||
| <?php else : ?> | ||
| <div class="alert alert-error"> | ||
| <?= $this->translate('You must be logged'); ?> | ||
| </div> | ||
| <?php endif; ?> |
Submodule scn-social-auth
updated
from 7c07d6 to 846110