RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-10 01:09:26 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6897 from lcobucci/update-phpstan

Browse Source 
Upgrade PHPStan to 0.9.x
This commit is contained in:
Luís Cobucci 2017-12-17 01:08:48 +01:00 committed by GitHub
commit 260c2e899a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -55,6 +55,10 @@ jobs:
env: DB=sqlite DEPENDENCIES=low env: DB=sqlite DEPENDENCIES=low
install: travis_retry composer update --prefer-dist --prefer-lowest install: travis_retry composer update --prefer-dist --prefer-lowest
- stage: Test
env: DB=sqlite DEPENDENCIES=stable
install: travis_retry composer update --prefer-dist --prefer-stable
- stage: Test - stage: Test
env: DB=sqlite COVERAGE env: DB=sqlite COVERAGE
before_script: before_script:
@ -68,9 +72,10 @@ jobs:
- stage: Code Quality - stage: Code Quality
env: DB=none STATIC_ANALYSIS env: DB=none STATIC_ANALYSIS
install: travis_retry composer update --prefer-dist --prefer-stable
before_script: before_script:
- echo "extension=redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo "extension=redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- travis_retry composer require --dev --prefer-dist --prefer-stable phpstan/phpstan:^0.8 symfony/console:^3.0 - travis_retry composer require --dev --prefer-dist --prefer-stable phpstan/phpstan:^0.9
script: vendor/bin/phpstan analyse -l 1 -c phpstan.neon lib script: vendor/bin/phpstan analyse -l 1 -c phpstan.neon lib
- stage: Code Quality - stage: Code Quality

2
lib/Doctrine/ORM/Internal/CommitOrderCalculator.php
View File

@ -52,7 +52,7 @@ class CommitOrderCalculator
* - <b>dependencyList</b> (array<string>) * - <b>dependencyList</b> (array<string>)
* Map of node dependencies defined as hashes. * Map of node dependencies defined as hashes.
* *
* @var array<stdClass> * @var array<\stdClass>
*/ */
private $nodeList = []; private $nodeList = [];

2
lib/Doctrine/ORM/Query/Parser.php
View File

@ -834,6 +834,8 @@ class Parser
*/ */
public function QueryLanguage() public function QueryLanguage()
{ {
$statement = null;
$this->lexer->moveNext(); $this->lexer->moveNext();
switch ($this->lexer->lookahead['type']) { switch ($this->lexer->lookahead['type']) {

2
lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php
View File

@ -158,7 +158,7 @@ class YamlExporter extends AbstractExporter
$associationMappingArray['fetch'] = $this->_getFetchModeString($associationMapping['fetch']); $associationMappingArray['fetch'] = $this->_getFetchModeString($associationMapping['fetch']);
} }
if (isset($mapping['id']) && $mapping['id'] === true) { if (isset($associationMapping['id']) && $associationMapping['id'] === true) {
$array['id'][$name]['associationKey'] = true; $array['id'][$name]['associationKey'] = true;
} }