Update CI/CD , drop support for old packages (#20)

Update CI/CD. Drop support for symfony 4

.github/workflows/ci.yml

@@ -4,20 +4,20 @@ on: [ push ]
 jobs:
   tests:
     name: PHPUnit PHP ${{ matrix.php }} Postgres ${{ matrix.database }} (Symfony ${{ matrix.symfony }})
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         php:
-          - '8.0'
           - '8.1'
+          - '8.2'
         symfony:
-          - '4.4.*'
+          - '6.3.*'
           - '5.4.*'
-          - '6.0.*'
         database:
-          - 12
-          - 13
           - 14
+          - 15
+          - 16
+          - 13
       fail-fast: false
 
     services:
@@ -49,10 +49,6 @@ jobs:
       - name: Configure Symfony
         run: composer config extra.symfony.require "${{ matrix.symfony }}"
 
-      - name: Prefer unstable Composer dependencies if Symfony 6.1
-        if: matrix.symfony == '6.1.*'
-        run: composer config prefer-stable false
-
       - name: Get Composer Cache Directory
         id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"

README.md

@@ -5,7 +5,7 @@ Geonames Bundle
 
 # Introduction
 
-Provides access to the data exported by [GeoNames.org][1] into  [Symfony 4, 5, 6][2]
+Provides access to the data exported by [GeoNames.org][1] into  [Symfony 5, 6][2]
 applications. Starting version 3.0 this library supporting only PostgreSQL database.
 
 

composer.json

@@ -17,21 +17,21 @@
     "require": {
         "php": ">=8.0",
         "ext-zip": "*",
+        "doctrine/annotations": "^1.0",
         "doctrine/doctrine-bundle": "^2.0",
         "guzzlehttp/guzzle": "^6.0 || ^7.0",
-        "symfony/console": "^4.0 || ^5.0 || ^6.0"
+        "symfony/console": "^5.4 || ^6.0"
     },
     "require-dev": {
         "doctrine/orm": "^2.5",
         "ergebnis/composer-normalize": "^2.26",
         "orklah/psalm-insane-comparison": "^2.0",
         "php-standard-library/psalm-plugin": "^1.1",
         "phpunit/phpunit": "^9.5.20",
-        "psalm/plugin-symfony": "^3.1",
+        "psalm/plugin-symfony": "^4.0 || ^5.0",
         "roave/security-advisories": "dev-latest",
-        "symfony/framework-bundle": "^4.0 || ^5.0 || ^6.0",
-        "symfony/yaml": "^4.0 || ^5.0 || ^6.0",
-        "vimeo/psalm": "^4.23",
+        "symfony/framework-bundle": "^5.4 || ^6.4",
+        "symfony/yaml": "^5.4 || ^6.4",
         "weirdan/doctrine-psalm-plugin": "^2.3"
     },
     "autoload": {
@@ -51,7 +51,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0.x-dev"
+            "dev-master": "3.1.x-dev"
         }
     },
     "scripts": {

docker-compose.tests.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   database:
-    image: postgres:${POSTGRES_VERSION:-13}-alpine
+    image: postgres:${POSTGRES_VERSION:-15}-alpine
     environment:
       POSTGRES_DB: ${POSTGRES_DB:-app}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-ChangeMe}
@@ -12,7 +12,7 @@ services:
       - 5432:5432
 
   tests:
-    image: cimg/php:8.0
+    image: cimg/php:8.2
     working_dir: /home/tests
     entrypoint: "bash -xc"
     command: "'composer install && composer tests'"

src/Entity/Country.php

@@ -3,7 +3,6 @@
 namespace Bordeux\Bundle\GeoNameBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use phpDocumentor\Reflection\Types\Integer;
 use Stringable;
 
 /**

tests/Command/ImportCommandTest.php

@@ -120,7 +120,6 @@ public function testContent(): void
 
         $timezone = $geoName->getTimezone();
         self::assertInstanceOf(Timezone::class, $timezone);
-        self::assertSame(372, $timezone->getId());
         self::assertSame("Europe/Warsaw", $timezone->getTimezone());
         self::assertSame("PL", $timezone->getCountryCode());
         self::assertSame(1.0, $timezone->getGmtOffset());