Skip to content

Commit 3273a33

Browse files
committed
Upgrading minimum required PHP version to 7.2
1 parent b387ac4 commit 3273a33

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

.scrutinizer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
build:
22
environment:
33
php:
4-
version: 7.1
4+
version: 7.4
55
nodes:
66
analysis:
77
project_setup:

.travis.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,53 +14,53 @@ matrix:
1414
env: PREFER_LOWEST="" DB=mysql NO_WEAKREF=1
1515
services:
1616
- mysql
17-
- php: 7.1
18-
env: PREFER_LOWEST="" DB=mysql COVERALLS=true
17+
- php: 7.4
18+
env: PREFER_LOWEST="" DB=mysql NO_WEAKREF=1 COVERALLS=true
1919
services:
2020
- mysql
21-
- php: 7.1
21+
- php: 7.2
2222
env: PREFER_LOWEST="--prefer-lowest" DB=mysql
2323
services:
2424
- mysql
25-
- php: 7.1
25+
- php: 7.2
2626
env: PREFER_LOWEST="" DB=mysql8
2727
sudo: required
2828
services:
2929
- docker
30-
- php: 7.1
30+
- php: 7.2
3131
env: PREFER_LOWEST="" DB=mariadb
3232
addons:
3333
mariadb: '10.3'
34-
- php: 7.1
34+
- php: 7.2
3535
env: PREFER_LOWEST="--prefer-lowest" DB=mariadb
3636
addons:
3737
mariadb: '10.3'
38-
- php: 7.1
38+
- php: 7.2
3939
env: PREFER_LOWEST="--prefer-lowest" DB=oracle PHPUNITFILE="-c phpunit.oracle.xml"
4040
sudo: required
4141
services:
4242
- docker
43-
- php: 7.1
43+
- php: 7.2
4444
env: PREFER_LOWEST="" DB=oracle PHPUNITFILE="-c phpunit.oracle.xml"
4545
sudo: required
4646
services:
4747
- docker
48-
- php: 7.1
48+
- php: 7.2
4949
env: PREFER_LOWEST="--prefer-lowest" DB=postgres PHPUNITFILE="-c phpunit.postgres.xml"
5050
addons:
5151
postgresql: "9.6"
5252
services:
5353
- postgresql
54-
- php: 7.1
54+
- php: 7.2
5555
env: PREFER_LOWEST="" DB=postgres PHPUNITFILE="-c phpunit.postgres.xml"
5656
addons:
5757
postgresql: "9.6"
5858
services:
5959
- postgresql
6060
allow_failures:
61-
- php: 7.1
61+
- php: 7.2
6262
env: PREFER_LOWEST="" DB=oracle PHPUNITFILE="-c phpunit.oracle.xml"
63-
- php: 7.1
63+
- php: 7.2
6464
env: PREFER_LOWEST="--prefer-lowest" DB=oracle PHPUNITFILE="-c phpunit.oracle.xml"
6565
env:
6666
global:
@@ -115,4 +115,4 @@ after_success:
115115
fi
116116
after_script:
117117
- if [ "$COVERALLS" = "true" ] ; then ./vendor/bin/php-coveralls -v; fi
118-
- if [ "$COVERALLS" = "true" ] ; then vendor/bin/couscous travis-auto-deploy --php-version=7.1 -vvv; fi
118+
- if [ "$COVERALLS" = "true" ] ; then vendor/bin/couscous travis-auto-deploy --php-version=7.2 -vvv; fi

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
],
2020
"require" : {
21-
"php" : ">=7.1",
21+
"php" : ">=7.2",
2222
"mouf/magic-query" : "^1.4",
2323
"mouf/schema-analyzer": "^1.1.4",
2424
"doctrine/dbal": "^2.9.2",
@@ -43,15 +43,15 @@
4343
"ext-intl": "*"
4444
},
4545
"require-dev" : {
46-
"phpunit/phpunit": "^7.4.4 || ^8.0.0",
46+
"phpunit/phpunit": "^8.5.8",
4747
"php-coveralls/php-coveralls": "^2.1",
4848
"wa72/simplelogger" : "^1.0",
49-
"friendsofphp/php-cs-fixer": "^2.16",
49+
"friendsofphp/php-cs-fixer": "^2.16.4",
5050
"symfony/process": "^3 || ^4 || ^5",
5151
"thecodingmachine/tdbm-fluid-schema-builder": "^1.0.0",
52-
"phpstan/phpstan": "^0.11.5",
53-
"thecodingmachine/phpstan-strict-rules": "^0.11.0",
54-
"bamarni/composer-bin-plugin": "^1.2",
52+
"phpstan/phpstan": "^0.11.19",
53+
"thecodingmachine/phpstan-strict-rules": "^0.11.2",
54+
"bamarni/composer-bin-plugin": "^1.4.1",
5555
"phpbench/phpbench": "^0.16.10"
5656
},
5757
"conflict": {

doc/install_service-provider.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ In this document, we will describe integration of TDBM 5 with [Simplex](https://
1818
}
1919
},
2020
"require": {
21-
"php": ">=7.1",
21+
"php": ">=7.2",
2222
"mnapoli/simplex": "^0.4.1",
2323
"thecodingmachine/tdbm-universal-provider": "^5",
2424
"thecodingmachine/discovery": "^1.2"

tests/Commands/GenerateCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function testCall(): void
3030
(new GenerateCommand($this->getConfiguration()))->run($input, $output);
3131
$result = $output->fetch();
3232

33-
$this->assertContains('Finished regenerating DAOs and beans', $result);
33+
$this->assertStringContainsString('Finished regenerating DAOs and beans', $result);
3434
//Check that the lock file was generated
3535
$this->assertFileExists($schemaFilePath);
3636
}

tests/TDBMServiceTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ public function testBuildFilterFromFilterBagIterator(): void
818818
public function testFindObjectsMethodWithoutResultIteratorClass(): void
819819
{
820820
$this->expectException(TDBMInvalidArgumentException::class);
821-
$this->expectExceptionMessageRegExp('/^\$resultIteratorClass should be a `' . preg_quote(ResultIterator::class, '/') . '`. `(.*)` provided\.$/');
821+
$this->expectExceptionMessageMatches('/^\$resultIteratorClass should be a `' . preg_quote(ResultIterator::class, '/') . '`. `(.*)` provided\.$/');
822822
$tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));
823823

824824
$tdbmService->findObjects('', null, [], null, [], null, null, self::class);
@@ -827,7 +827,7 @@ public function testFindObjectsMethodWithoutResultIteratorClass(): void
827827
public function testFindObjectsFromSqlMethodWithoutResultIteratorClass(): void
828828
{
829829
$this->expectException(TDBMInvalidArgumentException::class);
830-
$this->expectExceptionMessageRegExp('/^\$resultIteratorClass should be a `' . preg_quote(ResultIterator::class, '/') . '`. `(.*)` provided\.$/');
830+
$this->expectExceptionMessageMatches('/^\$resultIteratorClass should be a `' . preg_quote(ResultIterator::class, '/') . '`. `(.*)` provided\.$/');
831831
$tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));
832832

833833
$tdbmService->findObjectsFromSql('', '', null, [], null, null, null, self::class);
@@ -836,7 +836,7 @@ public function testFindObjectsFromSqlMethodWithoutResultIteratorClass(): void
836836
public function testFindObjectsFromRawSqlMethodWithoutResultIteratorClass(): void
837837
{
838838
$this->expectException(TDBMInvalidArgumentException::class);
839-
$this->expectExceptionMessageRegExp('/^\$resultIteratorClass should be a `' . preg_quote(ResultIterator::class, '/') . '`. `(.*)` provided\.$/');
839+
$this->expectExceptionMessageMatches('/^\$resultIteratorClass should be a `' . preg_quote(ResultIterator::class, '/') . '`. `(.*)` provided\.$/');
840840
$tdbmService = new TDBMService(new Configuration('TheCodingMachine\\TDBM\\Test\\Dao\\Bean', 'TheCodingMachine\\TDBM\\Test\\Dao', self::getConnection(), $this->getNamingStrategy(), null, null, new NullLogger()));
841841

842842
$tdbmService->findObjectsFromRawSql('', '', [], null, null, null, self::class);

0 commit comments

Comments
 (0)