Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/composer.json b/composer.json
- index 49ddd38..9a27adc 100644
- --- a/composer.json
- +++ b/composer.json
- @@ -2,8 +2,8 @@
- "require": {
- "php": ">=5.3.3",
- "polderknowledge/entityservice": "dev-master",
- - "youngguns/log": "0.16.0",
- - "youngguns/modulemanager": "0.16.0",
- + "youngguns/log": "~0.16",
- + "youngguns/modulemanager": "~0.16",
- "zendframework/zendframework": "2.4.*",
- "zfcampus/zf-development-mode": "~2.0",
- "youngguns/localemodule": "^0.2.1"
- diff --git a/composer.lock b/composer.lock
- index 9591a8c..596e565 100644
- --- a/composer.lock
- +++ b/composer.lock
- @@ -4,25 +4,28 @@
- "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
- "This file is @generated automatically"
- ],
- - "hash": "8bd5ad6b3aabcbed5f4521f665af6463",
- + "hash": "e9b6ca49ad38cef48ae0d269393fb8d4",
- "packages": [
- {
- "name": "doctrine/collections",
- - "version": "v1.2",
- + "version": "v1.3.0",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/collections.git",
- - "reference": "b99c5c46c87126201899afe88ec490a25eedd6a2"
- + "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a"
- },
- "dist": {
- "type": "zip",
- - "url": "https://api.github.com/repos/doctrine/collections/zipball/b99c5c46c87126201899afe88ec490a25eedd6a2",
- - "reference": "b99c5c46c87126201899afe88ec490a25eedd6a2",
- + "url": "https://api.github.com/repos/doctrine/collections/zipball/6c1e4eef75f310ea1b3e30945e9f06e652128b8a",
- + "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.2"
- },
- + "require-dev": {
- + "phpunit/phpunit": "~4.0"
- + },
- "type": "library",
- "extra": {
- "branch-alias": {
- @@ -40,17 +43,6 @@
- ],
- "authors": [
- {
- - "name": "Jonathan Wage",
- - "email": "jonwage@gmail.com",
- - "homepage": "http://www.jwage.com/",
- - "role": "Creator"
- - },
- - {
- - "name": "Guilherme Blanco",
- - "email": "guilhermeblanco@gmail.com",
- - "homepage": "http://www.instaclick.com"
- - },
- - {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- @@ -59,10 +51,16 @@
- "email": "kontakt@beberlei.de"
- },
- {
- + "name": "Guilherme Blanco",
- + "email": "guilhermeblanco@gmail.com"
- + },
- + {
- + "name": "Jonathan Wage",
- + "email": "jonwage@gmail.com"
- + },
- + {
- "name": "Johannes Schmitt",
- - "email": "schmittjoh@gmail.com",
- - "homepage": "https://github.com/schmittjoh",
- - "role": "Developer of wrapped JMSSerializerBundle"
- + "email": "schmittjoh@gmail.com"
- }
- ],
- "description": "Collections Abstraction library",
- @@ -72,7 +70,7 @@
- "collections",
- "iterator"
- ],
- - "time": "2014-02-03 23:07:43"
- + "time": "2015-04-14 22:21:58"
- },
- {
- "name": "polderknowledge/entityservice",
- @@ -80,23 +78,18 @@
- "source": {
- "type": "git",
- "url": "git@git.redknot.nl:polderknowledge/entityservice.git",
- - "reference": "f4a1c3963a89e07eda51868c5b8b61295f3de40d"
- + "reference": "c0a0b8f060553ba4157efb2b8c80c0fd4d9420bf"
- },
- "require": {
- - "doctrine/collections": "1.2.*",
- + "doctrine/collections": "~1.2",
- "php": ">=5.5.0",
- "youngguns/stdlib": ">=0.16,<1.0",
- "zendframework/zend-eventmanager": "~2",
- "zendframework/zend-servicemanager": "~2"
- },
- "require-dev": {
- - "doctrine/orm": "2.4.*",
- - "pdepend/pdepend": "1.*",
- - "phing/phing": "2.10.*",
- - "phpdocumentor/phpdocumentor": "~2.8",
- - "phpmd/phpmd": "1.*",
- - "phpunit/phpunit": "~4.0",
- - "squizlabs/php_codesniffer": "2.*",
- + "doctrine/orm": "~2.4",
- + "polderknowledge/build-tools": "dev-master@dev",
- "zendframework/zend-paginator": "~2",
- "zendframework/zend-validator": "~2"
- },
- @@ -109,7 +102,12 @@
- "PolderKnowledge\\EntityService\\": "src/"
- }
- },
- - "time": "2015-04-17 07:23:31"
- + "autoload-dev": {
- + "psr-4": {
- + "PolderKnowledge\\EntityServiceTest\\": "tests/"
- + }
- + },
- + "time": "2015-07-07 11:04:56"
- },
- {
- "name": "youngguns/localemodule",
- @@ -132,31 +130,45 @@
- },
- {
- "name": "youngguns/log",
- - "version": "0.16.0",
- - "target-dir": "Youngguns/Log",
- + "version": "0.17.0",
- "source": {
- "type": "git",
- "url": "git@git.redknot.nl:youngguns/log.git",
- - "reference": "0.16.0"
- + "reference": "523712b64e0aadedebe8b8b1379b78bfe53f761d"
- },
- "require": {
- "php": ">=5.3.3",
- "zendframework/zend-log": "2.*"
- },
- + "require-dev": {
- + "phpunit/phpunit": "~4.0",
- + "zendframework/zend-mvc": "~2.0",
- + "zendframework/zend-view": "~2.0"
- + },
- "type": "library",
- "autoload": {
- - "psr-0": {
- - "Youngguns\\Log\\": ""
- + "psr-4": {
- + "Youngguns\\Log\\": "src/"
- }
- },
- + "autoload-dev": {
- + "psr-4": {
- + "YounggunsTest\\Log\\": "tests/"
- + },
- + "files": [
- + "tests/functions.php",
- + "tests/ServiceLocatorStub.php"
- + ]
- + },
- "license": [
- "proprietary"
- ],
- "description": "Log component",
- + "homepage": "http://developers.polderknowledge.nl/gitlab/youngguns/log",
- "keywords": [
- "YoungGuns"
- ],
- - "time": "2015-01-21 09:34:25"
- + "time": "2015-06-29 13:57:01"
- },
- {
- "name": "youngguns/modulemanager",
- @@ -189,51 +201,68 @@
- },
- {
- "name": "youngguns/stdlib",
- - "version": "0.16.0",
- - "target-dir": "Youngguns/StdLib",
- + "version": "0.17.0",
- "source": {
- "type": "git",
- "url": "git@git.redknot.nl:youngguns/stdlib.git",
- - "reference": "0.16.0"
- + "reference": "bbc6e15d65f53331416e380ef61603c3be774781"
- },
- "require": {
- "php": ">=5.3.3"
- },
- + "require-dev": {
- + "doctrine/collections": "~1.2",
- + "phpunit/phpunit": "~4.0",
- + "youngguns/doctrine": "~0.9",
- + "zendframework/zend-code": "~2.0",
- + "zendframework/zend-eventmanager": "~2.0",
- + "zendframework/zend-servicemanager": "~2.0"
- + },
- "suggest": {
- "doctrine/collection": "Criteria are used by Creterion namespace in this package"
- },
- "type": "library",
- "autoload": {
- - "psr-0": {
- - "Youngguns\\StdLib\\": ""
- + "psr-4": {
- + "Youngguns\\StdLib\\": "src/"
- }
- },
- + "autoload-dev": {
- + "psr-4": {
- + "YounggunsTest\\StdLib\\": "tests/"
- + },
- + "files": [
- + "tests/functions.php",
- + "tests/ServiceLocatorStub.php"
- + ]
- + },
- "license": [
- "proprietary"
- ],
- "description": "StdLib component",
- + "homepage": "http://developers.polderknowledge.nl/gitlab/youngguns/stdlib",
- "keywords": [
- "YoungGuns"
- ],
- - "time": "2015-01-21 09:34:47"
- + "time": "2015-06-29 13:57:01"
- },
- {
- "name": "zendframework/zendframework",
- - "version": "2.4.1",
- + "version": "2.4.6",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/zf2.git",
- - "reference": "3b3b6f3374525344097024e9a05bcf24e46e3011"
- + "reference": "e0fc119111bace89e0ab7da57ab24d49713a17d1"
- },
- "dist": {
- "type": "zip",
- - "url": "https://api.github.com/repos/zendframework/zf2/zipball/3b3b6f3374525344097024e9a05bcf24e46e3011",
- - "reference": "3b3b6f3374525344097024e9a05bcf24e46e3011",
- + "url": "https://api.github.com/repos/zendframework/zf2/zipball/e0fc119111bace89e0ab7da57ab24d49713a17d1",
- + "reference": "e0fc119111bace89e0ab7da57ab24d49713a17d1",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.23",
- - "zendframework/zendxml": "~1.0-dev"
- + "zendframework/zendxml": "^1.0.1"
- },
- "replace": {
- "zendframework/zend-authentication": "self.version",
- @@ -332,28 +361,28 @@
- "framework",
- "zf2"
- ],
- - "time": "2015-05-07 17:08:57"
- + "time": "2015-08-03 15:03:22"
- },
- {
- "name": "zendframework/zendxml",
- - "version": "1.0.0",
- + "version": "1.0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/ZendXml.git",
- - "reference": "559b34f426d33a11c3db118e00ce14bb8dc64e5f"
- + "reference": "54edb3875aba5b45f02824f65f311c9fb2743a38"
- },
- "dist": {
- "type": "zip",
- - "url": "https://api.github.com/repos/zendframework/ZendXml/zipball/559b34f426d33a11c3db118e00ce14bb8dc64e5f",
- - "reference": "559b34f426d33a11c3db118e00ce14bb8dc64e5f",
- + "url": "https://api.github.com/repos/zendframework/ZendXml/zipball/54edb3875aba5b45f02824f65f311c9fb2743a38",
- + "reference": "54edb3875aba5b45f02824f65f311c9fb2743a38",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "require-dev": {
- - "fabpot/php-cs-fixer": "*@dev",
- - "phpunit/phpunit": "~3.7"
- + "phpunit/phpunit": "~3.7",
- + "squizlabs/php_codesniffer": "~1.5"
- },
- "type": "library",
- "extra": {
- @@ -363,7 +392,7 @@
- },
- "autoload": {
- "psr-0": {
- - "ZendXml": "library/"
- + "ZendXml\\": "library/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- @@ -377,29 +406,29 @@
- "xml",
- "zf2"
- ],
- - "time": "2014-03-05 22:25:44"
- + "time": "2015-08-03 14:50:10"
- },
- {
- "name": "zfcampus/zf-development-mode",
- - "version": "2.0.5",
- + "version": "2.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/zfcampus/zf-development-mode.git",
- - "reference": "1199c45418ba6328576c84a5e6c848da6fb29953"
- + "reference": "ff073d20bc9edb652e2e75d7323f1857f190d66b"
- },
- "dist": {
- "type": "zip",
- - "url": "https://api.github.com/repos/zfcampus/zf-development-mode/zipball/1199c45418ba6328576c84a5e6c848da6fb29953",
- - "reference": "1199c45418ba6328576c84a5e6c848da6fb29953",
- + "url": "https://api.github.com/repos/zfcampus/zf-development-mode/zipball/ff073d20bc9edb652e2e75d7323f1857f190d66b",
- + "reference": "ff073d20bc9edb652e2e75d7323f1857f190d66b",
- "shasum": ""
- },
- "require": {
- - "php": ">=5.3.23",
- - "zendframework/zend-console": ">=2.2.2,<3.0",
- - "zendframework/zend-mvc": ">=2.2.2,<3.0"
- + "php": ">=5.5",
- + "zendframework/zend-console": "^2.2.2",
- + "zendframework/zend-mvc": "^2.2.2"
- },
- "require-dev": {
- - "squizlabs/php_codesniffer": "~1.5"
- + "squizlabs/php_codesniffer": "^2.3.1"
- },
- "suggest": {
- "zendframework/zend-developer-tools": "dev-master",
- @@ -408,8 +437,8 @@
- "type": "library",
- "extra": {
- "branch-alias": {
- - "dev-master": "2.0-dev",
- - "dev-develop": "2.1-dev"
- + "dev-master": "2.1-dev",
- + "dev-develop": "2.2-dev"
- }
- },
- "autoload": {
- @@ -441,7 +470,7 @@
- "framework",
- "zf2"
- ],
- - "time": "2015-04-16 14:42:54"
- + "time": "2015-07-15 16:37:11"
- }
- ],
- "packages-dev": [
- diff --git a/config/application.config.php b/config/application.config.php
- index 2083a94..da4d4ab 100644
- --- a/config/application.config.php
- +++ b/config/application.config.php
- @@ -26,11 +26,6 @@ return array(
- ),
- ),
- 'service_manager' => array(
- - 'delegators' => array(
- - 'ModuleManager' => array(
- - 'Youngguns\ModuleManager\ClientsConfigDelegatorFactory'
- - ),
- - ),
- 'factories' => array(
- 'LazyServiceFactory' => 'Zend\ServiceManager\Proxy\LazyServiceFactoryFactory',
- ),
- diff --git a/public/.htaccess b/public/.htaccess
- index ce5ff60..390346f 100644
- --- a/public/.htaccess
- +++ b/public/.htaccess
- @@ -1,9 +1,9 @@
- RewriteEngine On
- -# The following makes sure that when the requested URL does not start
- +# The following makes sure that when the requested URL does not start
- # with www, we make it sure it does.
- -RewriteCond %{HTTP_HOST} !^www\. [NC]
- -RewriteRule ^(.*)$ http://www.%{SERVER_NAME}/$1 [L,R=301]
- +# RewriteCond %{HTTP_HOST} !^www\. [NC]
- +# RewriteRule ^(.*)$ http://www.%{SERVER_NAME}/$1 [L,R=301]
- # The following rule tells Apache that if the requested filename
- # exists, simply serve it.
- @@ -12,11 +12,11 @@ RewriteCond %{REQUEST_FILENAME} -l [OR]
- RewriteCond %{REQUEST_FILENAME} -d
- RewriteRule ^.*$ - [NC,L]
- -# The following rewrites all other queries to index.php. The
- +# The following rewrites all other queries to index.php. The
- # condition ensures that if you are using Apache aliases to do
- -# mass virtual hosting, the base path will be prepended to
- +# mass virtual hosting, the base path will be prepended to
- # allow proper resolution of the index.php file; it will work
- -# in non-aliased environments as well, providing a safe, one-size
- +# in non-aliased environments as well, providing a safe, one-size
- # fits all solution.
- RewriteCond %{REQUEST_URI}::$1 ^(/.+)(.+)::\2$
- RewriteRule ^(.*) - [E=BASE:%1]
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement