Skip to content

Commit 5cdcc2f

Browse files
ker0xker0x
committed
Drop support for Symfony < 5.4, add Symfony 6.4 and PHP 8.3 to CI, update .gitattributes file
1 parent 06c094c commit 5cdcc2f

10 files changed

+33
-97
lines changed

‎.gitattributes

+13-15
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
.editorconfig export-ignore
2-
.gitattributes export-ignore
3-
/.github/ export-ignore
4-
.gitignore export-ignore
5-
/.php_cs export-ignore
6-
/.scrutinizer.yml export-ignore
7-
/.styleci.yml export-ignore
8-
/.travis.yml export-ignore
9-
/behat.yml.dist export-ignore
10-
/features/ export-ignore
11-
/phpspec.ci.yml export-ignore
12-
/phpspec.yml.dist export-ignore
13-
/phpunit.xml.dist export-ignore
14-
/spec/ export-ignore
15-
/tests/ export-ignore
1+
.editorconfig export-ignore
2+
.gitattributes export-ignore
3+
/.github/ export-ignore
4+
.gitignore export-ignore
5+
/.php-cs-fixer.php export-ignore
6+
/CHANGELOG.md export-ignore
7+
/CODE_OF_CONDUCT.md export-ignore
8+
/CONTRIBUTING.md export-ignore
9+
/doc export-ignore
10+
/phpstan.neon.dist export-ignore
11+
/phpstan-baseline.neon export-ignore
12+
/phpunit.xml.dist export-ignore
13+
/tests/ export-ignore

‎.github/workflows/ci.yml

+10-11
Original file line numberDiff line numberDiff line change
@@ -62,30 +62,29 @@ jobs:
6262
fail-fast: true
6363
matrix:
6464
dependencies: ['highest']
65-
php: ['7.4', '8.0', '8.1', '8.2']
65+
php: ['7.4', '8.0', '8.1', '8.2', '8.3']
6666
include:
67-
- php: '7.4'
68-
sf_version: '4.4.*'
69-
dependencies: 'lowest'
70-
- php: '7.4'
71-
sf_version: '4.4.*'
7267
- php: '7.4'
7368
sf_version: '5.4.*'
7469
dependencies: 'lowest'
7570
- php: '8.0'
7671
sf_version: '5.4.*'
7772
- php: '8.1'
7873
sf_version: '5.4.*'
79-
- php: '8.0'
80-
sf_version: '6.0.*'
81-
- php: '8.1'
82-
sf_version: '6.0.*'
8374
- php: '8.2'
84-
sf_version: '6.2.*'
75+
sf_version: '5.4.*'
76+
- php: '8.3'
77+
sf_version: '5.4.*'
78+
- php: '8.1'
79+
sf_version: '6.4.*'
8580
- php: '8.2'
8681
sf_version: '6.4.*'
82+
- php: '8.3'
83+
sf_version: '6.4.*'
8784
- php: '8.2'
8885
sf_version: '7.0.*'
86+
- php: '8.3'
87+
sf_version: '7.0.*'
8988
steps:
9089
- name: "Setup PHP"
9190
uses: shivammathur/setup-php@v2

‎composer.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
"geocoder-php/plugin": "^1.5",
1616
"php-http/curl-client": "^2.3",
1717
"php-http/discovery": "^1.14",
18-
"symfony/console": "^4.4 || ^5.0 || ^6.0 || ^7.0",
19-
"symfony/framework-bundle": "^4.4 || ^5.0 || ^6.0 || ^7.0",
20-
"symfony/options-resolver": "^4.4 || ^5.0 || ^6.0 || ^7.0",
18+
"symfony/console": "^5.4 || ^6.0 || ^7.0",
19+
"symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0",
20+
"symfony/options-resolver": "^5.4 || ^6.0 || ^7.0",
2121
"willdurand/geocoder": "^4.6"
2222
},
2323
"require-dev": {
@@ -63,11 +63,11 @@
6363
"php-http/message": "^1.13",
6464
"phpstan/phpstan": "^1.9.2",
6565
"psr/http-client": "^1.0",
66-
"symfony/cache": "^4.4 || ^5.0 || ^6.0 || ^7.0",
67-
"symfony/config": "^4.4 || ^5.0 || ^6.0 || ^7.0",
68-
"symfony/phpunit-bridge": "^5.2 || ^6.0 || ^7.0",
69-
"symfony/validator": "^4.4 || ^5.0 || ^6.0 || ^7.0",
70-
"symfony/yaml": "^4.4 || ^5.0 || ^6.0 || ^7.0"
66+
"symfony/cache": "^5.4 || ^6.0 || ^7.0",
67+
"symfony/config": "^5.4 || ^6.0 || ^7.0",
68+
"symfony/phpunit-bridge": "^5.4 || ^6.0 || ^7.0",
69+
"symfony/validator": "^5.4 || ^6.0 || ^7.0",
70+
"symfony/yaml": "^5.4 || ^6.0 || ^7.0"
7171
},
7272
"conflict": {
7373
"geocoder-php/nominatim-provider": "<5.0"

‎phpstan-baseline.neon

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,12 @@ parameters:
121121
path: src/DependencyInjection/BazingaGeocoderExtension.php
122122

123123
-
124-
message: "#^Cannot call method end\\(\\) on Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeParentInterface\\|null\\.$#"
124+
message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeParentInterface\\:\\:end\\(\\)\\.$#"
125125
count: 2
126126
path: src/DependencyInjection/Configuration.php
127127

128128
-
129-
message: "#^Cannot call method variableNode\\(\\) on Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeParentInterface\\|null\\.$#"
129+
message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeParentInterface\\:\\:variableNode\\(\\)\\.$#"
130130
count: 1
131131
path: src/DependencyInjection/Configuration.php
132132

‎src/Validator/Constraint/Address.php

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
/**
1818
* @Annotation
19-
*
2019
* @Target({"PROPERTY", "METHOD", "ANNOTATION"})
2120
*
2221
* @author Tomas Norkūnas <[email protected]>

‎tests/Functional/BundleInitializationTest.php

-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
namespace Bazinga\GeocoderBundle\Tests\Functional;
1414

1515
use Bazinga\GeocoderBundle\BazingaGeocoderBundle;
16-
use Bazinga\GeocoderBundle\Tests\PublicServicePass;
1716
use Geocoder\Dumper\GeoArray;
1817
use Geocoder\Dumper\GeoJson;
1918
use Geocoder\Dumper\Gpx;
@@ -44,8 +43,6 @@ protected static function createKernel(array $options = []): KernelInterface
4443
*/
4544
$kernel = parent::createKernel($options);
4645
$kernel->addTestBundle(BazingaGeocoderBundle::class);
47-
$kernel->addTestCompilerPass(new PublicServicePass('|[Bb]azinga:*|'));
48-
$kernel->addTestCompilerPass(new PublicServicePass('|[gG]eocoder:*|'));
4946
$kernel->handleOptions($options);
5047

5148
return $kernel;

‎tests/Functional/GeocoderListenerTest.php

-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
use Bazinga\GeocoderBundle\Tests\Functional\Fixtures\Entity\DummyWithGetter;
1818
use Bazinga\GeocoderBundle\Tests\Functional\Fixtures\Entity\DummyWithInvalidGetter;
1919
use Bazinga\GeocoderBundle\Tests\Functional\Fixtures\Entity\DummyWithProperty;
20-
use Bazinga\GeocoderBundle\Tests\PublicServicePass;
2120
use Doctrine\Bundle\DoctrineBundle\ConnectionFactory;
2221
use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
2322
use Doctrine\ORM\Tools\SchemaTool;
@@ -56,8 +55,6 @@ protected static function createKernel(array $options = []): KernelInterface
5655
$kernel = parent::createKernel($options);
5756
$kernel->addTestBundle(DoctrineBundle::class);
5857
$kernel->addTestBundle(BazingaGeocoderBundle::class);
59-
$kernel->addTestCompilerPass(new PublicServicePass('|[Bb]azinga:*|'));
60-
$kernel->addTestCompilerPass(new PublicServicePass('|[gG]eocoder:*|'));
6158
if (defined(ConnectionFactory::class.'::DEFAULT_SCHEME_MAP')) {
6259
$kernel->addTestConfig(static function (ContainerBuilder $container) {
6360
$container->prependExtensionConfig('doctrine', [

‎tests/Functional/PluginInteractionTest.php

-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
namespace Bazinga\GeocoderBundle\Tests\Functional;
1414

1515
use Bazinga\GeocoderBundle\BazingaGeocoderBundle;
16-
use Bazinga\GeocoderBundle\Tests\PublicServicePass;
1716
use Geocoder\Query\GeocodeQuery;
1817
use Nyholm\BundleTest\TestKernel;
1918
use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
@@ -36,8 +35,6 @@ protected static function createKernel(array $options = []): KernelInterface
3635
*/
3736
$kernel = parent::createKernel($options);
3837
$kernel->addTestBundle(BazingaGeocoderBundle::class);
39-
$kernel->addTestCompilerPass(new PublicServicePass('|[Bb]azinga:*|'));
40-
$kernel->addTestCompilerPass(new PublicServicePass('|[gG]eocoder:*|'));
4138
$kernel->handleOptions($options);
4239

4340
return $kernel;

‎tests/Functional/ProviderFactoryTest.php

-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
namespace Bazinga\GeocoderBundle\Tests\Functional;
1414

1515
use Bazinga\GeocoderBundle\BazingaGeocoderBundle;
16-
use Bazinga\GeocoderBundle\Tests\PublicServicePass;
1716
use Geocoder\Provider\AlgoliaPlaces\AlgoliaPlaces;
1817
use Geocoder\Provider\ArcGISOnline\ArcGISOnline;
1918
use Geocoder\Provider\BingMaps\BingMaps;
@@ -64,8 +63,6 @@ protected static function createKernel(array $options = []): KernelInterface
6463
*/
6564
$kernel = parent::createKernel($options);
6665
$kernel->addTestBundle(BazingaGeocoderBundle::class);
67-
$kernel->addTestCompilerPass(new PublicServicePass('|[Bb]azinga:*|'));
68-
$kernel->addTestCompilerPass(new PublicServicePass('|[gG]eocoder:*|'));
6966
$kernel->handleOptions($options);
7067

7168
return $kernel;

‎tests/PublicServicePass.php

-48
This file was deleted.

0 commit comments

Comments
 (0)