From 5c9937f9799eb3fc3be413775da8970bd20f34ad Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 7 Feb 2014 11:09:02 +0100 Subject: [PATCH 01/10] Removing PHP 5.3.3 support This commit aligns to Zend Framework 2.3's policy on PHP 5.3 support --- .travis.yml | 1 - composer.json | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3fcdd547..3fa59cd3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: php php: - - 5.3.3 - 5.3 - 5.4 - 5.5 diff --git a/composer.json b/composer.json index de73231d..b61ba901 100644 --- a/composer.json +++ b/composer.json @@ -32,13 +32,14 @@ } ], "require": { - "php": ">=5.3.3", + "php": ">=5.3.23", "doctrine/doctrine-module": "0.8.*", "doctrine/orm": ">=2.4,<2.6-dev", "doctrine/dbal": ">=2.4,<2.6-dev", "zendframework/zend-stdlib": ">=2.2", "zendframework/zend-mvc": ">=2.2", - "zendframework/zend-servicemanager": ">=2.2" + "zendframework/zend-servicemanager": ">=2.2", + "squizlabs/php_codesniffer": "1.4.*" }, "require-dev": { "zendframework/zendframework": "2.*", From af03ba9b8548ce87580c8e2c52edd86afba640c7 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 7 Feb 2014 11:12:25 +0100 Subject: [PATCH 02/10] Adding upgrade notes for the PHP 5.3.23 version requirement bump --- UPGRADE.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/UPGRADE.md b/UPGRADE.md index a5fa136b..9cf0c536 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -4,6 +4,7 @@ were updated to properly handle 'empty_option'. According to ZF2 docs, setting empty_option to NULL instructs a \Zend\Form\Element\Select that it should not add an "empty option" to a select list. [#281](https://github.com/doctrine/DoctrineORMModule/pull/281) + * The required PHP version is bumped to `5.3.23` [#306](https://github.com/doctrine/DoctrineORMModule/pull/306) # 0.8.0 @@ -33,4 +34,4 @@ Doctrine ORM's CLI, you now have to access it either via `./vendor/bin/doctrine- # 0.3.0 After version `0.2.1`, submodules have been dropped as they were too heavy and complex to manage. If you now want to use this module, please use composer, as described in -[README.md](http://www.github.com/doctrine/DoctrineORMModule/tree/master/README.md) \ No newline at end of file +[README.md](http://www.github.com/doctrine/DoctrineORMModule/tree/master/README.md) From fd9066b21fe020df7b391e824498d7aee7f62ccc Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 7 Feb 2014 11:16:20 +0100 Subject: [PATCH 03/10] PHPCS is only a dev dependency --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index b61ba901..2f038df1 100644 --- a/composer.json +++ b/composer.json @@ -38,8 +38,7 @@ "doctrine/dbal": ">=2.4,<2.6-dev", "zendframework/zend-stdlib": ">=2.2", "zendframework/zend-mvc": ">=2.2", - "zendframework/zend-servicemanager": ">=2.2", - "squizlabs/php_codesniffer": "1.4.*" + "zendframework/zend-servicemanager": ">=2.2" }, "require-dev": { "zendframework/zendframework": "2.*", From 8bcc4411bb4113ddd85ccb217c6c6cb51c9cd727 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 7 Feb 2014 11:19:14 +0100 Subject: [PATCH 04/10] Bumping ZF2 dependencies, branch alias for master, doctrine-module deps --- composer.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 2f038df1..12f71227 100644 --- a/composer.json +++ b/composer.json @@ -33,20 +33,20 @@ ], "require": { "php": ">=5.3.23", - "doctrine/doctrine-module": "0.8.*", + "doctrine/doctrine-module": "0.9.*", "doctrine/orm": ">=2.4,<2.6-dev", "doctrine/dbal": ">=2.4,<2.6-dev", - "zendframework/zend-stdlib": ">=2.2", - "zendframework/zend-mvc": ">=2.2", - "zendframework/zend-servicemanager": ">=2.2" + "zendframework/zend-stdlib": "~2.3", + "zendframework/zend-mvc": "~2.3", + "zendframework/zend-servicemanager": "~2.3" }, "require-dev": { - "zendframework/zendframework": "2.*", + "zendframework/zendframework": "~2.3", "doctrine/data-fixtures": "1.0.*", "zendframework/zend-developer-tools": "*", "doctrine/migrations": "1.*", - "phpunit/phpunit": ">=3.7", - "squizlabs/php_codesniffer": "1.4.*" + "phpunit/phpunit": "~3.7", + "squizlabs/php_codesniffer": "1.5.*" }, "suggest": { "zendframework/zend-form": "if you want to use form elements backed by Doctrine", @@ -61,7 +61,7 @@ }, "extra": { "branch-alias": { - "dev-master": "0.8.x-dev" + "dev-master": "0.9.x-dev" } } } From 6fe35d0caf23b2ec90bc601a66d8e40b4cb5bad2 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 7 Feb 2014 13:22:52 +0100 Subject: [PATCH 05/10] Adding scrutinizer-ci and phpcs inspections --- .scrutinizer.yml | 37 +++++++++++++++++++++++++++++++++++++ .travis.yml | 7 +++---- 2 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 .scrutinizer.yml diff --git a/.scrutinizer.yml b/.scrutinizer.yml new file mode 100644 index 00000000..c3172761 --- /dev/null +++ b/.scrutinizer.yml @@ -0,0 +1,37 @@ +before_commands: + - "composer update --prefer-source" + +tools: + php_code_coverage: + enabled: true + test_command: ./vendor/bin/phpunit -c phpunit.xml.dist + php_code_sniffer: + enabled: true + config: + standard: PSR2 + filter: + paths: ["src/*", "tests/*"] + php_cpd: + enabled: true + excluded_dirs: ["build", "docs", "tests", "vendor"] + php_cs_fixer: + enabled: true + config: + level: all + filter: + paths: ["src/*", "tests/*"] + php_loc: + enabled: true + excluded_dirs: ["build", "docs", "tests", "vendor"] + php_mess_detector: + enabled: true + filter: + paths: ["src/*"] + php_pdepend: + enabled: true + excluded_dirs: ["build", "docs", "tests", "vendor"] + php_analyzer: true + php_analyzer: + filter: + paths: ["src/*", "tests/*"] + sensiolabs_security_checker: true diff --git a/.travis.yml b/.travis.yml index 3fa59cd3..7c281980 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,9 @@ matrix: - php: hhvm before_script: - - composer install --dev --prefer-source - - wget http://cs.sensiolabs.org/get/php-cs-fixer.phar + - composer update --prefer-source script: - ./vendor/bin/phpunit --coverage-clover ./build/clover.xml - - php build/coverage-checker.php build/clover.xml 60 - - ./.travis/check-cs.sh + - sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then php build/coverage-checker.php build/clover.xml 70; fi" + - sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.3' ]; then ./vendor/bin/phpcs --standard=PSR2 ./src/ ./tests/; fi" \ No newline at end of file From e79a12ad49804c85ab812d9bfc91eb23dda0d77f Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 7 Feb 2014 13:23:32 +0100 Subject: [PATCH 06/10] Lowering requirements until doctrine/DoctrineModule#376 is merged --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 12f71227..43d42f8e 100644 --- a/composer.json +++ b/composer.json @@ -61,7 +61,7 @@ }, "extra": { "branch-alias": { - "dev-master": "0.9.x-dev" + "dev-master": "0.8.x-dev" } } } From 0cd64c0f88e57bec0ae7be98fdb0bf2b6d7b0767 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 7 Feb 2014 13:25:58 +0100 Subject: [PATCH 07/10] Adding scrutinizer-ci badges --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 45729c78..ca43a064 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Doctrine 2 ORM Module for Zend Framework 2 -[![Master branch build status](https://secure.travis-ci.org/doctrine/DoctrineORMModule.png?branch=master)](http://travis-ci.org/doctrine/DoctrineORMModule) [![Latest Stable Version](https://poser.pugx.org/doctrine/doctrine-orm-module/v/stable.png)](https://packagist.org/packages/doctrine/doctrine-orm-module) [![Total Downloads](https://poser.pugx.org/doctrine/doctrine-orm-module/downloads.png)](https://packagist.org/packages/doctrine/doctrine-orm-module) +[![Master branch build status](https://secure.travis-ci.org/doctrine/DoctrineORMModule.png?branch=master)](http://travis-ci.org/doctrine/DoctrineORMModule) [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/doctrine/DoctrineORMModule/badges/quality-score.png?s=1e2a047fb1bb0f66937bcbc3a61f960c8089c835)](https://scrutinizer-ci.com/g/doctrine/DoctrineORMModule/) [![Code Coverage](https://scrutinizer-ci.com/g/doctrine/DoctrineORMModule/badges/coverage.png?s=377656ded5ffaaf4635acfb26729caa212fb5d76)](https://scrutinizer-ci.com/g/doctrine/DoctrineORMModule/) [![Latest Stable Version](https://poser.pugx.org/doctrine/doctrine-orm-module/v/stable.png)](https://packagist.org/packages/doctrine/doctrine-orm-module) [![Total Downloads](https://poser.pugx.org/doctrine/doctrine-orm-module/downloads.png)](https://packagist.org/packages/doctrine/doctrine-orm-module) DoctrineORMModule integrates Doctrine 2 ORM with Zend Framework 2 quickly and easily. From 37551e9f47daef997e14687215abe65a5dc6789e Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 7 Feb 2014 13:27:04 +0100 Subject: [PATCH 08/10] Lowering required DoctrineModule version to 0.8.x until doctrine/DoctrineModule#376 is merged --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 43d42f8e..8b015e7e 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ ], "require": { "php": ">=5.3.23", - "doctrine/doctrine-module": "0.9.*", + "doctrine/doctrine-module": "0.8.*", "doctrine/orm": ">=2.4,<2.6-dev", "doctrine/dbal": ">=2.4,<2.6-dev", "zendframework/zend-stdlib": "~2.3", @@ -61,7 +61,7 @@ }, "extra": { "branch-alias": { - "dev-master": "0.8.x-dev" + "dev-master": "0.9.x-dev" } } } From 7f95fde911218edff44eae8653147eecfceb416b Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 7 Feb 2014 13:40:14 +0100 Subject: [PATCH 09/10] Minor CS fixes as of PHPCS --- src/DoctrineORMModule/Options/Configuration.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DoctrineORMModule/Options/Configuration.php b/src/DoctrineORMModule/Options/Configuration.php index b5a7559f..5cb1dce9 100644 --- a/src/DoctrineORMModule/Options/Configuration.php +++ b/src/DoctrineORMModule/Options/Configuration.php @@ -174,7 +174,7 @@ class Configuration extends DBALConfiguration * Entity listener resolver or service name of the entity listener resolver * to be set in ORM configuration (if any) * - * @link http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html#entity-listeners-resolver + * @link http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html * @var string|null|EntityListenerResolver */ protected $entityListenerResolver; @@ -590,7 +590,7 @@ public function setEntityListenerResolver($entityListenerResolver) throw new InvalidArgumentException(sprintf( 'entityListenerResolver must be either a string, a Doctrine\ORM\Mapping\EntityListenerResolver ' - . 'instance or null, %s given', + . 'instance or null, %s given', is_object($entityListenerResolver) ? get_class($entityListenerResolver) : gettype($entityListenerResolver) )); } From ca56c932020874c995a01c37489541bdf62f976c Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Sat, 8 Feb 2014 18:18:28 +0100 Subject: [PATCH 10/10] Requiring DoctrineModule 0.9.x since doctrine/DoctrineModule#376 was merged --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8b015e7e..12f71227 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ ], "require": { "php": ">=5.3.23", - "doctrine/doctrine-module": "0.8.*", + "doctrine/doctrine-module": "0.9.*", "doctrine/orm": ">=2.4,<2.6-dev", "doctrine/dbal": ">=2.4,<2.6-dev", "zendframework/zend-stdlib": "~2.3",