Skip to content

Commit 3cc71ba

Browse files
dereuromarkdereuromark
authored
Merge pull request #1643 from spryker/cs-tests-src
CS for tests
2 parents 42c6da4 + 008ff38 commit 3cc71ba

File tree

313 files changed

+1617
-1426
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

313 files changed

+1617
-1426
lines changed

‎config/phpcs.xml

-4
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,4 @@
3030
<severity>0</severity>
3131
</rule>
3232

33-
<rule ref="Spryker.Commenting.DocBlockReturnSelf">
34-
<severity>0</severity>
35-
</rule>
36-
3733
</ruleset>

‎phpstan-baseline.neon

-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎resources/dtd/database.dtd

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<!--
22
Propel XML database schema DTD
3-
$Id: database.dtd,v 1.7 2005/03/30 11:38:18 hlellelid Exp $
43

54
This is based very closely on the schema DTD for Torque, but
65
some differences do exist.

‎src/Propel/Generator/Behavior/QueryCache/QueryCacheBehavior.php

-1
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,6 @@ public function doCount(ConnectionInterface \$con = null)
325325
\$this->cacheStore(\$key, \$sql);
326326
}
327327
328-
329328
return \$con->getDataFetcher(\$stmt);
330329
}
331330
";

‎src/Propel/Generator/Builder/Util/SchemaReader.php

+6-9
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,18 @@ class SchemaReader
9696
private $defaultPackage;
9797

9898
/**
99-
* @var bool
100-
*/
101-
private $firstPass;
102-
103-
/**
99+
* @deprecated Unused.
100+
*
104101
* @var string
105102
*/
106103
private $encoding;
107104

108105
/**
109-
* @var array
110-
* two-dimensional array,
106+
* Two-dimensional array,
111107
* first dimension is for schemas(key is the path to the schema file),
112-
* second is for tags within the schema
108+
* second is for tags within the schema.
109+
*
110+
* @var array
113111
*/
114112
private $schemasTagsStack = [];
115113

@@ -124,7 +122,6 @@ public function __construct(?PlatformInterface $defaultPlatform = null, $default
124122
{
125123
$this->schema = new Schema($defaultPlatform);
126124
$this->defaultPackage = $defaultPackage;
127-
$this->firstPass = true;
128125
$this->encoding = $encoding;
129126
}
130127

‎src/Propel/Generator/Command/Console/Input/ArrayInput.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
/*
3+
/**
44
* This file is part of the Symfony package.
55
*
66
* (c) Fabien Potencier <[email protected]>

‎src/Propel/Generator/Util/BehaviorLocator.php

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ class BehaviorLocator
3535
private $composerDir;
3636

3737
/**
38+
* @deprecated Unused.
39+
*
3840
* @var \Propel\Generator\Config\GeneratorConfigInterface
3941
*/
4042
private $generatorConfig;

‎src/Propel/Runtime/ActiveQuery/Criteria.php

+21-9
Original file line numberDiff line numberDiff line change
@@ -771,11 +771,13 @@ public function get($key)
771771
* @param string $key
772772
* @param mixed $value
773773
*
774-
* @return $this Instance of self.
774+
* @return $this
775775
*/
776776
public function put($key, $value)
777777
{
778-
return $this->add($key, $value);
778+
$this->add($key, $value);
779+
780+
return $this;
779781
}
780782

781783
/**
@@ -936,7 +938,9 @@ public function addJoin($left, $right, $joinType = null)
936938
$conditions[] = $condition;
937939
}
938940

939-
return $this->addMultipleJoin($conditions, $joinType);
941+
$this->addMultipleJoin($conditions, $joinType);
942+
943+
return $this;
940944
}
941945

942946
$join = new Join();
@@ -966,7 +970,9 @@ public function addJoin($left, $right, $joinType = null)
966970

967971
$join->setJoinType($joinType);
968972

969-
return $this->addJoinObject($join);
973+
$this->addJoinObject($join);
974+
975+
return $this;
970976
}
971977

972978
/**
@@ -1042,7 +1048,9 @@ public function addMultipleJoin($conditions, $joinType = null)
10421048
$join->setJoinType($joinType);
10431049
$join->setJoinCondition($joinCondition);
10441050

1045-
return $this->addJoinObject($join);
1051+
$this->addJoinObject($join);
1052+
1053+
return $this;
10461054
}
10471055

10481056
/**
@@ -1886,10 +1894,14 @@ public function addUsingOperator($p1, $value = null, $operator = null, $preferCo
18861894
if ($this->defaultCombineOperator === Criteria::LOGICAL_OR) {
18871895
$this->defaultCombineOperator = Criteria::LOGICAL_AND;
18881896

1889-
return $this->addOr($p1, $value, $operator, $preferColumnCondition);
1897+
$this->addOr($p1, $value, $operator, $preferColumnCondition);
1898+
1899+
return $this;
18901900
}
18911901

1892-
return $this->addAnd($p1, $value, $operator, $preferColumnCondition);
1902+
$this->addAnd($p1, $value, $operator, $preferColumnCondition);
1903+
1904+
return $this;
18931905
}
18941906

18951907
/**
@@ -2808,7 +2820,7 @@ public function _elseif($cond)
28082820
*
28092821
* @throws \Propel\Runtime\Exception\LogicException
28102822
*
2811-
* @return \Propel\Runtime\Util\PropelConditionalProxy|$this
2823+
* @return \Propel\Runtime\Util\PropelConditionalProxy|static
28122824
*/
28132825
public function _else()
28142826
{
@@ -2825,7 +2837,7 @@ public function _else()
28252837
*
28262838
* @throws \Propel\Runtime\Exception\LogicException
28272839
*
2828-
* @return $this
2840+
* @return $this|\Propel\Runtime\ActiveQuery\Criteria
28292841
*/
28302842
public function _endif()
28312843
{

‎src/Propel/Runtime/ActiveQuery/ModelCriteria.php

+7-3
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,9 @@ public function condition($conditionName, $clause, $value = null, $bindingType =
154154
*/
155155
public function filterBy($column, $value, $comparison = Criteria::EQUAL)
156156
{
157-
return $this->add($this->getRealColumnName($column), $value, $comparison);
157+
$this->add($this->getRealColumnName($column), $value, $comparison);
158+
159+
return $this;
158160
}
159161

160162
/**
@@ -882,7 +884,7 @@ public function setPrimaryCriteria(ModelCriteria $criteria, Join $previousJoin)
882884
/**
883885
* Gets the primary criteria for this secondary Criteria
884886
*
885-
* @return $this|null The primary criteria
887+
* @return \Propel\Runtime\ActiveQuery\ModelCriteria|null The primary criteria
886888
*/
887889
public function getPrimaryCriteria()
888890
{
@@ -2240,7 +2242,9 @@ public static function getShortName($fullyQualifiedClassName)
22402242
*/
22412243
public function addUsingAlias($column, $value = null, $operator = null)
22422244
{
2243-
return $this->addUsingOperator($this->getAliasedColName($column), $value, $operator);
2245+
$this->addUsingOperator($this->getAliasedColName($column), $value, $operator);
2246+
2247+
return $this;
22442248
}
22452249

22462250
/**

‎src/Propel/Runtime/ActiveQuery/ModelJoin.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,9 @@ public function isPrimary()
156156
*/
157157
public function setRelationAlias($relationAlias)
158158
{
159-
return $this->setRightTableAlias($relationAlias);
159+
$this->setRightTableAlias($relationAlias);
160+
161+
return $this;
160162
}
161163

162164
/**

‎tests/Propel/Tests/Bookstore/AuthorCollection.php

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<?php
22

3+
/**
4+
* MIT License. This file is part of the Propel package.
5+
* For the full copyright and license information, please view the LICENSE
6+
* file that was distributed with this source code.
7+
*/
8+
39
namespace Propel\Tests\Bookstore;
410

511
use Propel\Runtime\Collection\ObjectCollection;

‎tests/Propel/Tests/BookstoreLoggingTest.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?php
22

33
/**
4-
* This file is part of the Propel package.
4+
* MIT License. This file is part of the Propel package.
55
* For the full copyright and license information, please view the LICENSE
66
* file that was distributed with this source code.
7-
*
8-
* @license MIT License
97
*/
108

119
namespace Propel\Tests;

‎tests/Propel/Tests/BookstoreTest.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?php
22

33
/**
4-
* This file is part of the Propel package.
4+
* MIT License. This file is part of the Propel package.
55
* For the full copyright and license information, please view the LICENSE
66
* file that was distributed with this source code.
7-
*
8-
* @license MIT License
97
*/
108

119
namespace Propel\Tests;

‎tests/Propel/Tests/CharacterEncodingTest.php

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?php
22

33
/**
4-
* This file is part of the Propel package.
4+
* MIT License. This file is part of the Propel package.
55
* For the full copyright and license information, please view the LICENSE
66
* file that was distributed with this source code.
7-
*
8-
* @license MIT License
97
*/
108

119
namespace Propel\Tests;
@@ -38,13 +36,6 @@
3836
*/
3937
class CharacterEncodingTest extends BookstoreTestBase
4038
{
41-
/**
42-
* Database adapter.
43-
*
44-
* @var DBAdapter
45-
*/
46-
private $adapter;
47-
4839
/**
4940
* @throws \Exception
5041
*

‎tests/Propel/Tests/Common/Config/ConfigTestCase.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?php
22

33
/**
4-
* This file is part of the Propel package.
4+
* MIT License. This file is part of the Propel package.
55
* For the full copyright and license information, please view the LICENSE
66
* file that was distributed with this source code.
7-
*
8-
* @license MIT License
97
*/
108

119
namespace Propel\Tests\Common\Config;
@@ -21,11 +19,13 @@
2119
class ConfigTestCase extends TestCase
2220
{
2321
/**
24-
* @var null
25-
* Symfony\Component\Filesystem\Filesystem instance
22+
* @var \Symfony\Component\Filesystem\Filesystem|null
2623
*/
2724
private $fileSystem;
2825

26+
/**
27+
* @return \Symfony\Component\Filesystem\Filesystem
28+
*/
2929
public function getFilesystem()
3030
{
3131
if (null === $this->fileSystem) {

‎tests/Propel/Tests/Common/Config/ConfigurationManagerTest.php

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?php
22

33
/**
4-
* This file is part of the Propel package.
4+
* MIT License. This file is part of the Propel package.
55
* For the full copyright and license information, please view the LICENSE
66
* file that was distributed with this source code.
7-
*
8-
* @license MIT License
97
*/
108

119
namespace Propel\Tests\Common\Config;
@@ -114,6 +112,7 @@ public function testNotExistingConfigFileLoadsDefaultSettingsAndDoesNotThrowExce
114112
$this->getFilesystem()->dumpFile('doctrine.yaml', $yamlConf);
115113

116114
$manager = new TestableConfigurationManager();
115+
$this->assertInstanceOf(ConfigurationManager::class, $manager);
117116
}
118117

119118
/**
@@ -154,7 +153,7 @@ public function testUnsupportedExtensionsAreIgnored()
154153
}
155154

156155
/**
157-
* @expectedException Propel\Common\Config\Exception\InvalidArgumentException
156+
* @expectedException \Propel\Common\Config\Exception\InvalidArgumentException
158157
*
159158
* @exceptionMessage Propel expects only one configuration file
160159
*
@@ -177,7 +176,7 @@ public function testMoreThanOneConfigurationFileInSameDirectoryThrowsException()
177176
}
178177

179178
/**
180-
* @expectedException Propel\Common\Config\Exception\InvalidArgumentException
179+
* @expectedException \Propel\Common\Config\Exception\InvalidArgumentException
181180
*
182181
* @exceptionMessage Propel expects only one configuration file
183182
*
@@ -385,7 +384,7 @@ public function testMergeExtraProperties()
385384
}
386385

387386
/**
388-
* @expectedException Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
387+
* @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
389388
* @expectedExceptionMessage Unrecognized options "foo, bar" under "propel"
390389
*
391390
* @return void
@@ -439,7 +438,7 @@ classname: Propel\Runtime\Connection\ConnectionWrapper
439438
}
440439

441440
/**
442-
* @expectedException Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
441+
* @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
443442
* @expectedExceptionMessage The child node "database" at path "propel" must be configured
444443
*
445444
* @return void
@@ -458,7 +457,7 @@ public function testNotDefineDatabaseSectionTrowsException()
458457
}
459458

460459
/**
461-
* @expectedException Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
460+
* @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
462461
* @expectedExceptionMessage Dots are not allowed in connection names
463462
*
464463
* @return void
@@ -648,7 +647,7 @@ classname: Propel\Runtime\Connection\DebugPDO
648647
}
649648

650649
/**
651-
* @expectedException Propel\Common\Config\Exception\InvalidArgumentException
650+
* @expectedException \Propel\Common\Config\Exception\InvalidArgumentException
652651
* @expectedExceptionMessage Invalid configuration property name
653652
*
654653
* @return void

0 commit comments

Comments
 (0)