Skip to content

Commit 1cf9264

Browse files
NyholmAlexandre-T
Nyholm
and
Alexandre-T
authored
Alex master (#71)
* Symfony5 updates * composer updated * phpunit.xml.dist updated to force the phpunit 6.5 * travis updated to add test on php7.4 and symfony5 * Symfony5 updates * composer updated * phpunit.xml.dist updated to force the phpunit 6.5 * travis updated to add test on php7.4 and symfony5 * dunglas/symfony-lock replaced by symfony/flex in the `travis.yml` file * Symfony5 updates * composer updated * removing bolt * phpunit.xml.dist updated to force the phpunit 6.5 * travis updated to add test on php7.4 and symfony5 * dunglas/symfony-lock replaced by symfony/flex in the `travis.yml` file * Symfony5 updates * composer updated * removing bolt * phpunit.xml.dist updated to force the phpunit 6.5 * travis updated to add test on php7.4 and symfony5 * dunglas/symfony-lock replaced by symfony/flex in the `travis.yml` file * Symfony5 updates * composer updated * calling longitude-one instead of graphaware * phpunit.xml.dist updated to force the phpunit 6.5 * travis updated to add test on php7.4 and symfony5 * dunglas/symfony-lock replaced by symfony/flex in the `travis.yml` file * Symfony5 updates * composer updated * calling longitude-one instead of graphaware * phpunit.xml.dist updated to force the phpunit 8.5 * Fixing framework.yml * travis updated to add test on php7.4 and symfony5 * dunglas/symfony-lock replaced by symfony/flex in the `travis.yml` file * minor Co-authored-by: Alexandre Tranchant <[email protected]>
1 parent 848a73a commit 1cf9264

File tree

5 files changed

+34
-41
lines changed

5 files changed

+34
-41
lines changed

‎.travis.yml

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,41 +9,36 @@ cache:
99
env:
1010
global:
1111
- TEST_COMMAND="composer test"
12-
- SYMFONY_PHPUNIT_VERSION="6.5"
13-
14-
branches:
15-
except:
16-
- /^analysis-.*$/
12+
- SYMFONY_PHPUNIT_VERSION="8.5"
1713

1814
matrix:
1915
fast_finish: true
2016
include:
2117
# Test with lowest dependencies
2218
- php: 7.2
2319
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak"
24-
- php: 7.0
25-
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak"
2620

2721
# Test the latest stable release
28-
- php: 7.0
29-
- php: 7.1
3022
- php: 7.2
31-
env: COVERAGE=true TEST_COMMAND="composer test-ci" DEPENDENCIES="graphaware/neo4j-php-ogm:^1.0@rc"
23+
- php: 7.3
24+
env: COVERAGE=true TEST_COMMAND="composer test-ci" DEPENDENCIES="longitude-one/neo4j-php-ogm:^1.0@rc"
3225

33-
# Force some major versions of Symfony
34-
- php: 7.2
35-
env: DEPENDENCIES="dunglas/symfony-lock:^2"
36-
- php: 7.2
37-
env: DEPENDENCIES="dunglas/symfony-lock:^3"
38-
- php: 7.2
39-
env: DEPENDENCIES="dunglas/symfony-lock:^4"
26+
# Force maintained versions of Symfony
27+
- php: 7.3
28+
env: SYMFONY_REQUIRE="4.4.*"
29+
- php: 7.3
30+
env: SYMFONY_REQUIRE="5.0.*"
31+
- php: 7.3
32+
env: SYMFONY_REQUIRE="5.1.*"
33+
- php: 7.4
34+
env: SYMFONY_REQUIRE="5.1.*"
4035

4136
# Latest commit to master
42-
- php: 7.3
43-
env: STABILITY="dev"
37+
- php: 7.4
38+
env: STABILITY="dev" #allowed to fail.
4439

4540
allow_failures:
46-
# Dev-master is allowed to fail.
41+
# Dev-master is allowed to fail.
4742
- env: STABILITY="dev"
4843

4944
before_install:
@@ -52,8 +47,6 @@ before_install:
5247
- if ! [ -z "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi;
5348

5449
install:
55-
# To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
56-
- if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then composer update --prefer-dist --no-interaction --prefer-stable --quiet; fi
5750
- composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
5851
- vendor/bin/simple-phpunit install
5952

‎Tests/Functional/app/config/framework.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ framework:
88
validation:
99
enabled: false
1010
router:
11-
resource: "%kernel.root_dir%/config/routing.yml"
11+
resource: "%kernel.project_dir%/config/routing.yml"
12+
utf8: true

‎Tests/Unit/DependencyInjection/Neo4jExtensionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111
class Neo4jExtensionTest extends AbstractExtensionTestCase
1212
{
13-
protected function getMinimalConfiguration()
13+
protected function getMinimalConfiguration(): array
1414
{
1515
$this->setParameter('kernel.cache_dir', 'foo');
1616

@@ -41,7 +41,7 @@ public function testDataCollectorNotLoadedWhenDisabled()
4141
$this->assertContainerBuilderNotHasService('neo4j.collector.debug_collector');
4242
}
4343

44-
protected function getContainerExtensions()
44+
protected function getContainerExtensions(): array
4545
{
4646
return [
4747
new Neo4jExtension(),

‎composer.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,18 @@
1515
}
1616
],
1717
"require": {
18-
"php": "^7.0",
18+
"php": "^7.2",
1919
"graphaware/neo4j-bolt": "^1.6",
2020
"graphaware/neo4j-php-client": "^4.6.4",
21-
"symfony/dependency-injection": " ^2.8.3 || ^3.0.3 || ^4.0",
22-
"symfony/framework-bundle": "^2.8.32 || ^3.0 || ^4.0",
23-
"symfony/http-kernel": "^2.8 || ^3.0 || ^4.0",
21+
"symfony/dependency-injection": "^4.4 || ^5.0",
22+
"symfony/flex": "^1.8",
23+
"symfony/framework-bundle": "^4.4 || ^5.0",
24+
"symfony/http-kernel": "^4.4 || ^5.0",
2425
"twig/twig": "^1.18 || ^2.0"
2526
},
2627
"require-dev": {
27-
"symfony/phpunit-bridge": "^3.4.19|^4.0",
28-
"matthiasnoback/symfony-dependency-injection-test": "^2.3"
28+
"symfony/phpunit-bridge": "^4.4 || ^5.0",
29+
"matthiasnoback/symfony-dependency-injection-test": "^4.1"
2930
},
3031
"suggest": {
3132
"graphaware/neo4j-php-ogm": "To have EntityManager support"

‎phpunit.xml.dist

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<phpunit bootstrap="./vendor/autoload.php"
4-
colors="true"
5-
convertErrorsToExceptions="true"
6-
convertNoticesToExceptions="true"
7-
convertWarningsToExceptions="true"
8-
syntaxCheck="true">
3+
<phpunit bootstrap="./vendor/autoload.php" colors="true"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:noNamespaceSchemaLocation="vendor/bin/.phpunit/phpunit-8.5-0/phpunit.xsd">
96
<testsuites>
107
<testsuite name="Unit tests">
118
<directory suffix="Test.php">./Tests/Unit</directory>
@@ -15,6 +12,11 @@
1512
</testsuite>
1613
</testsuites>
1714

15+
<php>
16+
<server name="SYMFONY_PHPUNIT_VERSION" value="8.5" />
17+
<server name="KERNEL_DIR" value="./Tests/Resources/app" />
18+
</php>
19+
1820
<filter>
1921
<whitelist>
2022
<directory>./</directory>
@@ -25,8 +27,4 @@
2527
</exclude>
2628
</whitelist>
2729
</filter>
28-
29-
<php>
30-
<server name="KERNEL_DIR" value="./Tests/Resources/app" />
31-
</php>
3230
</phpunit>

0 commit comments

Comments
 (0)