NTO-180 merged upstream changes

.gitattributes

@@ -1,7 +1,8 @@
+/.docker export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/.travis.yml export-ignore
-/build.properties.dev export-ignore
-/build.xml export-ignore
+/.github export-ignore
+
+/docker-compose.yml
 /tests export-ignore
 /tools export-ignore

.github/workflows/continuous-integration.yml

@@ -0,0 +1,61 @@
+name: "Continuous Integration"
+
+on:
+  pull_request:
+    branches:
+      - php82
+    paths:
+      - .github/workflows/continuous-integration.yml
+      - composer.*
+      - lib/**
+      - tests/**
+
+  push:
+    branches:
+      - php82
+    paths:
+      - .github/workflows/continuous-integration.yml
+      - composer.*
+      - lib/**
+      - tests/**
+
+env:
+  fail-fast: true
+
+jobs:
+  tests:
+    name: "Doctrine1 Tests"
+    runs-on: "ubuntu-latest"
+    strategy:
+      matrix:
+        php-version:
+          - "8.2"
+          - "8.3"
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: "true"
+
+      - name: Install PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: "${{ matrix.php-version }}"
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer install --prefer-dist
+
+      - name: Run Tests
+        run: cd tests && php run.php

README.md

@@ -20,7 +20,7 @@ Installation
 
 Using [Composer](http://getcomposer.org/doc/00-intro.md) as dependency management:
 
-    composer require friendsofsymfony1/doctrine1 "1.5.*"
+    composer require friendsofsymfony1/doctrine1 "1.4.*"
     composer install
 
 

composer.json

@@ -20,9 +20,10 @@
         }
     ],
     "require": {
-        "php": ">=8.1",
+        "php": ">=8.2",
         "ext-mbstring": "*",
-        "ext-pdo": "*"
+        "ext-pdo": "*",
+        "ext-zlib": "*"
     },
     "support": {
         "issues": "https://github.com/JamesAndJamesFulfilment/doctrine1/issues",
@@ -37,5 +38,8 @@
         "branch-alias": {
             "dev-php81": "1.5-dev"
         }
+    },
+    "config": {
+        "sort-packages": true
     }
 }

docker-compose.yml

@@ -15,30 +15,12 @@ services:
       - |
         exec tail -f /dev/null
 
-  php81:
+  php82:
+    <<: *services_php8x
     build:
-      context: .docker/php74_81
+      context: .docker/php74_82
       args:
-        PHP_VERSION: '8.1'
-    working_dir: /app/tests
-    volumes:
-      - .:/app
-      - db_socket:/var/run/mysqld
-    entrypoint:
-      - sh
-      - -c
-      - |
-        {
-          echo 'pdo_mysql.default_socket = /var/run/mysqld/mysql.sock'
-          echo 'memory_limit = -1'
-          echo 'short_open_tag = off'
-          echo 'magic_quotes_gpc = off'
-          echo 'date.timezone = "UTC"'
-        } | tee -a /usr/local/etc/php/php.ini
-
-        exec tail -f /dev/null
-    depends_on:
-      - db
+        PHP_VERSION: '8.2'
 
   db:
     image: mysql:5.5.62

lib/Doctrine/Access.php

@@ -96,10 +96,7 @@ public function __unset($name)
     }
 
     /**
-     * Check if an offset axists
-     *
-     * @param   mixed $offset
-     * @return  boolean Whether or not this object contains $offset
+     * @return bool
      */
     #[\ReturnTypeWillChange]
     public function offsetExists($offset)
@@ -108,10 +105,6 @@ public function offsetExists($offset)
     }
 
     /**
-     * An alias of get()
-     *
-     * @see     get, __get
-     * @param   mixed $offset
      * @return  mixed
      */
     #[\ReturnTypeWillChange]
@@ -127,11 +120,6 @@ public function offsetGet($offset)
     }
 
     /**
-     * Sets $offset to $value
-     *
-     * @see     set, __set
-     * @param   mixed $offset
-     * @param   mixed $value
      * @return  void
      */
     #[\ReturnTypeWillChange]
@@ -145,22 +133,19 @@ public function offsetSet($offset, $value)
     }
 
     /**
-     * Unset a given offset
-     *
-     * @see   set, offsetSet, __set
-     * @param mixed $offset
+     * @return void
      */
     #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
-        return $this->remove($offset);
+        $this->remove($offset);
     }
 
     /**
      * Remove the element with the specified offset
      *
      * @param mixed $offset The offset to remove
-     * @return boolean True if removed otherwise false
+     * @return bool True if removed otherwise false
      */
     public function remove($offset)
     {
@@ -191,8 +176,8 @@ public function set($offset, $value)
     }
 
     /**
-     * Check if the specified offset exists 
-     * 
+     * Check if the specified offset exists
+     *
      * @param mixed $offset The offset to check
      * @return boolean True if exists otherwise false
      */
@@ -202,9 +187,9 @@ public function contains($offset)
     }
 
     /**
-     * Add the value  
-     * 
-     * @param mixed $value The value to add 
+     * Add the value
+     *
+     * @param mixed $value The value to add
      * @return void
      */
     public function add($value)

lib/Doctrine/Cli/AnsiColorFormatter.php

@@ -115,7 +115,7 @@ public function formatSection($section, $text, $size = null)
     {
         $width = 9 + strlen($this->format('', 'INFO'));
 
-        return sprintf(">> %-${width}s %s", $this->format($section, 'INFO'), $this->excerpt($text, $size));
+        return sprintf(">> %-{$width}s %s", $this->format($section, 'INFO'), $this->excerpt($text, $size));
     }
 
     /**