Skip to content

Commit bf06931

Browse files
authored
Merge pull request #1608 from spryker/php8-prep
Prepare for php8 pre check branch.
2 parents 0022188 + 04de223 commit bf06931

File tree

132 files changed

+191
-193
lines changed

Some content is hidden

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

132 files changed

+191
-193
lines changed

tests/Propel/Tests/BookstoreLoggingTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
*/
3333
class BookstoreLoggingTest extends BookstoreEmptyTestBase
3434
{
35-
public function setUp()
35+
public function setUp(): void
3636
{
3737
parent::setUp();
3838
PolymorphicRelationLogQuery::create()->deleteAll();

tests/Propel/Tests/CharacterEncodingTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class CharacterEncodingTest extends BookstoreTestBase
4747
*/
4848
private $adapter;
4949

50-
public function setUp()
50+
public function setUp(): void
5151
{
5252
parent::setUp();
5353
if (!extension_loaded('iconv')) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class ConfigurationManagerTest extends ConfigTestCase
2626
*/
2727
private $fixturesDir;
2828

29-
public function setUp()
29+
public function setUp(): void
3030
{
3131
$this->currentDir = getcwd();
3232
$this->fixturesDir = realpath( __DIR__ . '/../../../../Fixtures') . '/Configuration';
@@ -35,7 +35,7 @@ public function setUp()
3535
chdir($this->fixturesDir);
3636
}
3737

38-
public function tearDown()
38+
public function tearDown(): void
3939
{
4040
chdir($this->currentDir);
4141
$this->getFileSystem()->remove($this->fixturesDir);

tests/Propel/Tests/Common/Config/Loader/FileLoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class FileLoaderTest extends TestCase
1717
{
1818
private $loader;
1919

20-
public function setUp()
20+
public function setUp(): void
2121
{
2222
$this->loader = new TestableFileLoader();
2323
}

tests/Propel/Tests/Common/Config/Loader/IniFileLoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class IniFileLoaderTest extends ConfigTestCase
1818
{
1919
protected $loader;
2020

21-
protected function setUp()
21+
protected function setUp(): void
2222
{
2323
$this->loader = new IniFileLoader(new FileLocator(sys_get_temp_dir()));
2424
}

tests/Propel/Tests/Common/Config/Loader/JsonFileLoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class JsonFileLoaderTest extends ConfigTestCase
1818
{
1919
protected $loader;
2020

21-
protected function setUp()
21+
protected function setUp(): void
2222
{
2323
$this->loader = new JsonFileLoader(new FileLocator(sys_get_temp_dir()));
2424
}

tests/Propel/Tests/Common/Config/Loader/PhpFileLoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class PhpFileLoaderTest extends ConfigTestCase
1818
{
1919
protected $loader;
2020

21-
protected function setUp()
21+
protected function setUp(): void
2222
{
2323
$this->loader = new PhpFileLoader(new FileLocator(sys_get_temp_dir()));
2424
}

tests/Propel/Tests/Common/Config/Loader/XmlFileLoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class XmlFileLoaderTest extends ConfigTestCase
1818
{
1919
protected $loader;
2020

21-
protected function setUp()
21+
protected function setUp(): void
2222
{
2323
$this->loader = new XmlFileLoader(new FileLocator(sys_get_temp_dir()));
2424
}

tests/Propel/Tests/Common/Config/Loader/YamlFileLoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class YamlFileLoaderTest extends ConfigTestCase
1919
{
2020
protected $loader;
2121

22-
protected function setUp()
22+
protected function setUp(): void
2323
{
2424
$this->loader = new YamlFileLoader(new FileLocator(sys_get_temp_dir()));
2525
}

tests/Propel/Tests/Generator/Behavior/AggregateColumn/AggregateColumnBehaviorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
*/
3434
class AggregateColumnBehaviorTest extends BookstoreTestBase
3535
{
36-
protected function setUp()
36+
protected function setUp(): void
3737
{
3838
parent::setUp();
3939
include_once(__DIR__.'/AggregateColumnsBehaviorTestClasses.php');

tests/Propel/Tests/Generator/Behavior/Archivable/ArchivableBehaviorObjectBuilderModifierTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
class ArchivableBehaviorObjectBuilderModifierTest extends TestCase
2626
{
27-
public function setUp()
27+
public function setUp(): void
2828
{
2929
if (!class_exists('\ArchivableTest10')) {
3030
$schema = <<<EOF

tests/Propel/Tests/Generator/Behavior/Archivable/ArchivableBehaviorQueryBuilderModifierTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
class ArchivableBehaviorQueryBuilderModifierTest extends TestCase
2626
{
27-
public function setUp()
27+
public function setUp(): void
2828
{
2929
if (!class_exists('\ArchivableTest100')) {
3030
$schema = <<<EOF

tests/Propel/Tests/Generator/Behavior/Archivable/ArchivableBehaviorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ArchivableBehaviorTest extends TestCase
2525
{
2626
protected static $generatedSQL;
2727

28-
public function setUp()
28+
public function setUp(): void
2929
{
3030
if (!class_exists('\ArchivableTest1')) {
3131
$schema = <<<EOF

tests/Propel/Tests/Generator/Behavior/BehaviorLocatorTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
class BehaviorLocatorTest extends TestCase
2323
{
24-
protected function setUp()
24+
protected function setUp(): void
2525
{
2626
parent::setUp();
2727
require_once(__DIR__ . '/../../../../Fixtures/behavior-installer/src/gossi/propel/behavior/l10n/L10nBehavior.php');
@@ -33,31 +33,31 @@ public function testBehaviorLocatorWithComposerLock()
3333
$configOptions['propel']['paths']['composerDir'] = __DIR__ . '/../../../../Fixtures/behavior-installer';
3434
$config = new QuickGeneratorConfig($configOptions);
3535
$locator = new BehaviorLocator($config);
36-
36+
3737
// test found behaviors
3838
$behaviors = $locator->getBehaviors();
3939
$this->assertSame(1, count($behaviors));
40-
40+
4141
$this->assertTrue(array_key_exists('l10n', $behaviors));
4242
$this->assertSame('gossi/propel-l10n-behavior', $behaviors['l10n']['package']);
43-
43+
4444
// test class name
4545
$this->assertSame('\\gossi\\propel\\behavior\\l10n\\L10nBehavior', $locator->getBehavior('l10n'));
4646
}
47-
47+
4848
public function testBehaviorLocatorWithComposerJson()
4949
{
5050
$configOptions['propel']['paths']['composerDir'] = __DIR__ . '/../../../../Fixtures/behavior-development';
5151
$config = new QuickGeneratorConfig($configOptions);
5252
$locator = new BehaviorLocator($config);
53-
53+
5454
// test found behaviors
5555
$behaviors = $locator->getBehaviors();
5656
$this->assertSame(1, count($behaviors));
57-
57+
5858
$this->assertTrue(array_key_exists('collection', $behaviors));
5959
$this->assertSame('propel/collection-behavior', $behaviors['collection']['package']);
60-
60+
6161
// test class name
6262
$this->assertSame('\\Propel\\Behavior\\Collection\\CollectionBehavior', $locator->getBehavior('collection'));
6363
}

tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehaviorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
*/
4141
class ConcreteInheritanceBehaviorTest extends BookstoreTestBase
4242
{
43-
public function setUp()
43+
public function setUp(): void
4444
{
4545
parent::setUp();
4646

tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehaviorWithBehaviorExclusionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
class ConcreteInheritanceBehaviorWithBehaviorExclusionTest extends TestCase
2424
{
25-
public function setUp()
25+
public function setUp(): void
2626
{
2727
parent::setUp();
2828

tests/Propel/Tests/Generator/Behavior/Delegate/DelegateBehaviorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
class DelegateBehaviorTest extends TestCase
2525
{
2626

27-
public function setUp()
27+
public function setUp(): void
2828
{
2929
if (!class_exists('DelegateDelegate')) {
3030
$schema = <<<EOF

tests/Propel/Tests/Generator/Behavior/I18n/I18nBehaviorObjectBuilderModifierTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*/
2727
class I18nBehaviorObjectBuilderModifierTest extends TestCase
2828
{
29-
public function setUp()
29+
public function setUp(): void
3030
{
3131
if (!class_exists('\I18nBehaviorTest1')) {
3232
$schema = <<<EOF

tests/Propel/Tests/Generator/Behavior/I18n/I18nBehaviorQueryBuilderModifierTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
class I18nBehaviorQueryBuilderModifierTest extends TestCase
2626
{
2727

28-
public function setUp()
28+
public function setUp(): void
2929
{
3030
if (!class_exists('\I18nBehaviorTest11')) {
3131
$schema = <<<EOF

tests/Propel/Tests/Generator/Behavior/NestedSet/TestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class TestCase extends BaseTestCase
2020
{
2121
protected $con;
2222

23-
public function setUp()
23+
public function setUp(): void
2424
{
2525
if (!class_exists('NestedSetTable9')) {
2626
$schema = <<<XML

tests/Propel/Tests/Generator/Behavior/ObjectBehaviorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
class ObjectBehaviorTest extends BookstoreTestBase
2424
{
25-
protected function setUp()
25+
protected function setUp(): void
2626
{
2727
//prevent issue DSN not Found
2828
self::$isInitialized = false;

tests/Propel/Tests/Generator/Behavior/QueryCache/QueryCacheTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626
class QueryCacheTest extends BookstoreTestBase
2727
{
28-
protected function setUp()
28+
protected function setUp(): void
2929
{
3030
//prevent issue DSN not Found
3131
self::$isInitialized = false;
@@ -79,7 +79,7 @@ public function testSimpleCountSql()
7979

8080
$this->assertEquals($expectedSql, $renderedSql);
8181
}
82-
82+
8383
public function testWithPaginate()
8484
{
8585
QuerycacheTable1Query::create()->deleteAll();
@@ -92,19 +92,19 @@ public function testWithPaginate()
9292
$coll[]= $b;
9393
}
9494
$coll->save();
95-
95+
9696
$pager = $this->getPager(2, 1);
9797
$this->assertEquals(5, $pager->getNbResults());
98-
98+
9999
$results = $pager->getResults();
100100
$this->assertEquals('query cache with paginate offset 0 limit 2', $pager->getQuery()->getQueryKey());
101101
$this->assertEquals(2, count($results));
102102
$this->assertEquals('Title1', $results[1]->getTitle());
103-
103+
104104
//jump to page 3
105105
$pager = $this->getPager(2, 3);
106106
$this->assertEquals(5, $pager->getNbResults());
107-
107+
108108
$results = $pager->getResults();
109109
$this->assertEquals('query cache with paginate offset 4 limit 2', $pager->getQuery()->getQueryKey());
110110
$this->assertEquals(1, count($results));
@@ -123,13 +123,13 @@ public function testQueryIsNotCachedIfExceptionIsThrown()
123123

124124
$this->assertNull($q->cacheFetch('test4'), 'The query is not cached, if it has thrown exception');
125125
}
126-
126+
127127
protected function getPager($maxPerPage, $page = 1)
128128
{
129129
$query = QuerycacheTable1Query::create()
130130
->setQueryKey('query cache with paginate')
131131
->orderByTitle();
132-
132+
133133
$pager = new PropelModelPager($query, $maxPerPage);
134134
$pager->setPage($page);
135135
$pager->init();

tests/Propel/Tests/Generator/Behavior/Sluggable/SluggableBehaviorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
*/
3434
class SluggableBehaviorTest extends BookstoreTestBase
3535
{
36-
protected function setUp()
36+
protected function setUp(): void
3737
{
3838
//prevent issue DSN not Found
3939
self::$isInitialized = false;

tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorObjectBuilderModifierTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
class SortableBehaviorObjectBuilderModifierTest extends TestCase
2525
{
26-
public function setUp()
26+
public function setUp(): void
2727
{
2828
parent::setUp();
2929

tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorObjectBuilderModifierWithScopeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
*/
2929
class SortableBehaviorObjectBuilderModifierWithScopeTest extends TestCase
3030
{
31-
public function setUp()
31+
public function setUp(): void
3232
{
3333
parent::setUp();
3434

tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryBuilderModifierTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*/
2727
class SortableBehaviorQueryBuilderModifierTest extends TestCase
2828
{
29-
public function setUp()
29+
public function setUp(): void
3030
{
3131
parent::setUp();
3232

tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryBuilderModifierWithScopeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*/
2727
class SortableBehaviorQueryBuilderModifierWithScopeTest extends TestCase
2828
{
29-
public function setUp()
29+
public function setUp(): void
3030
{
3131
parent::setUp();
3232

tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryUtilsBuilderModifierTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
class SortableBehaviorQueryUtilsBuilderModifierTest extends TestCase
2626
{
27-
public function setUp()
27+
public function setUp(): void
2828
{
2929
parent::setUp();
3030

tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryUtilsBuilderModifierWithScopeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
class SortableBehaviorQueryUtilsBuilderModifierWithScopeTest extends TestCase
2626
{
27-
public function setUp()
27+
public function setUp(): void
2828
{
2929
parent::setUp();
3030

tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorWithEnumScopeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
class SortableBehaviorWithEnumScopeTest extends TestCase
2525
{
26-
public function setUp()
26+
public function setUp(): void
2727
{
2828
parent::setUp();
2929

tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorWithSetScopeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
class SortableBehaviorWithSetScopeTest extends TestCase
2323
{
24-
public function setUp()
24+
public function setUp(): void
2525
{
2626
parent::setUp();
2727

tests/Propel/Tests/Generator/Behavior/TableBehaviorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
class TableBehaviorTest extends TestCase
2222
{
23-
protected function setUp()
23+
protected function setUp(): void
2424
{
2525
parent::setUp();
2626
}

tests/Propel/Tests/Generator/Behavior/Timestampable/TimestampableBehaviorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*/
3131
class TimestampableBehaviorTest extends BookstoreTestBase
3232
{
33-
public static function setUpBeforeClass()
33+
public static function setUpBeforeClass(): void
3434
{
3535
static::$isInitialized = false;
3636
parent::setUpBeforeClass();

0 commit comments

Comments
 (0)