Skip to content
Merged
37 changes: 37 additions & 0 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -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
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: php

php:
- 5.3.3
- 5.3
- 5.4
- 5.5
Expand All @@ -12,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"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
3 changes: 2 additions & 1 deletion UPGRADE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
[README.md](http://www.github.com/doctrine/DoctrineORMModule/tree/master/README.md)
18 changes: 9 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,21 @@
}
],
"require": {
"php": ">=5.3.3",
"doctrine/doctrine-module": "0.8.*",
"php": ">=5.3.23",
"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",
Expand All @@ -61,7 +61,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "0.8.x-dev"
"dev-master": "0.9.x-dev"
}
}
}
4 changes: 2 additions & 2 deletions src/DoctrineORMModule/Options/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's $entityListenerResolver so why not point to entity listener resolver docs?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PHPCS is being stupid here... didn't find a workaround

* @var string|null|EntityListenerResolver
*/
protected $entityListenerResolver;
Expand Down Expand Up @@ -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)
));
}
Expand Down