JamesAndJamesFulfilment · Jul 4, 2024
diff --git a/‎.docker/php74_81/Dockerfile
+34 b/‎.docker/php74_81/Dockerfile
+34
diff --git a/‎README.md
+1-1 b/‎README.md
+1-1
diff --git a/‎composer.json
+2-3 b/‎composer.json
+2-3
diff --git a/‎docker-compose.yml
+4-92 b/‎docker-compose.yml
+4-92
diff --git a/‎lib/Doctrine/Collection.php
+5-5 b/‎lib/Doctrine/Collection.php
+5-5
diff --git a/‎lib/Doctrine/Collection/Iterator.php
+5-9 b/‎lib/Doctrine/Collection/Iterator.php
+5-9
diff --git a/‎lib/Doctrine/Collection/OnDemand.php
+7-12 b/‎lib/Doctrine/Collection/OnDemand.php
+7-12
diff --git a/‎lib/Doctrine/Connection/Profiler.php
+12-12 b/‎lib/Doctrine/Connection/Profiler.php
+12-12
diff --git a/‎lib/Doctrine/Connection/Sqlite.php
+2-2 b/‎lib/Doctrine/Connection/Sqlite.php
+2-2
@@ -0,0 +1,34 @@
+ARG PHP_VERSION
+FROM php:${PHP_VERSION}-cli
+
+RUN docker-php-ext-install pdo
+RUN docker-php-ext-install pdo_mysql
+
+# Install mbstring PHP extension
+#
+RUN set -eux; \
+  apt-get update; \
+  apt-get install -y --no-upgrade --no-install-recommends \
+    libonig-dev \
+  ; \
+  \
+  apt-get clean; \
+  rm -rf /var/lib/apt/lists/*; \
+  \
+  docker-php-ext-install mbstring
+
+# For consistent mime type file guesser
+RUN set -eux; \
+  distFilePath=`which file`; \
+  \
+  mv ${distFilePath} ${distFilePath}.dist; \
+  { \
+    echo '#! /bin/sh -eu'; \
+    echo ''; \
+    echo "${distFilePath}"'.dist "$@" | sed -e s,application/x-pie-executable,application/x-executable,g'; \
+  } | tee ${distFilePath}; \
+  \
+  chmod +x ${distFilePath}; \
+  \
+  file /bin/ls --mime | grep application/x-executable; \
+  :;
@@ -20,7 +20,7 @@ Installation
 
 Using [Composer](http://getcomposer.org/doc/00-intro.md) as dependency management:
 
-    composer require friendsofsymfony1/doctrine1 "1.4.*"
+    composer require james-and-james-fulfilment/doctrine1 "1.5.*"
     composer install
 
 
 
@@ -20,8 +20,7 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
-        "ext-iconv": "*",
+        "php": ">=8.1",
         "ext-mbstring": "*",
         "ext-pdo": "*",
         "ext-zlib": "*"
@@ -37,7 +36,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.4-dev"
+            "dev-php81": "1.5-dev"
         }
     },
     "config": {
 
@@ -15,29 +15,11 @@ services:
       - |
         exec tail -f /dev/null
 
-  php53:
-    build: .docker/php53
-    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/lib/php.ini
-
-        exec tail -f /dev/null
-
-  php54: &services_php54
+  php81:
     build:
-      context: .docker/php54
+      context: .docker/php74_81
+      args:
+        PHP_VERSION: '8.1'
     working_dir: /app/tests
     volumes:
       - .:/app
@@ -58,76 +40,6 @@ services:
     depends_on:
       - db
 
-  php55:
-    <<: *services_php54
-    build:
-      context: .docker/php55_71
-      args:
-        PHP_TAG: '5.5-cli'
-
-  php56:
-    <<: *services_php54
-    build:
-      context: .docker/php55_71
-      args:
-        PHP_TAG: '5.6-cli-jessie'
-
-  php70:
-    <<: *services_php54
-    build:
-      context: .docker/php55_71
-      args:
-        PHP_TAG: '7.0-cli-jessie'
-
-  php71:
-    <<: *services_php54
-    build:
-      context: .docker/php55_71
-      args:
-        PHP_TAG: '7.1-cli-jessie'
-
-  php72:
-    <<: *services_php54
-    build:
-      context: .docker/php72_73
-      args:
-        PHP_VERSION: '7.2'
-
-  php73:
-    <<: *services_php54
-    build:
-      context: .docker/php72_73
-      args:
-        PHP_VERSION: '7.3'
-
-  php74:
-    <<: *services_php54
-    build:
-      context: .docker/php74_82
-      args:
-        PHP_VERSION: '7.4'
-
-  php80:
-    <<: *services_php54
-    build:
-      context: .docker/php74_82
-      args:
-        PHP_VERSION: '8.0'
-
-  php81:
-    <<: *services_php54
-    build:
-      context: .docker/php74_82
-      args:
-        PHP_VERSION: '8.1'
-
-  php82:
-    <<: *services_php54
-    build:
-      context: .docker/php74_82
-      args:
-        PHP_VERSION: '8.2'
-
   db:
     image: mysql:5.5.62
     environment:
 
@@ -91,7 +91,7 @@ public function __construct($table, $keyColumn = null)
         }
 
         if ($keyColumn === null) {
-        	$keyColumn = $table->getAttribute(Doctrine_Core::ATTR_COLL_KEY);
+            $keyColumn = $table->getAttribute(Doctrine_Core::ATTR_COLL_KEY);
         }
 
         if ($keyColumn !== null) {
@@ -152,15 +152,15 @@ public function serialize()
     {
         $vars = $this->__serialize();
 
-        return serialize($vars);
+        return $vars;
     }
 
     /**
-     * This method is automatically called everytime a Doctrine_Collection object is unserialized
+     * Unserializes a Doctrine_Collection instance for php 7.4+
      *
-     * @return void
+     * @param string $serialized  A serialized Doctrine_Collection instance
      */
-    public function unserialize($serialized)
+    public function __unserialize($data)
     {
         $array = unserialize($serialized);
 
 
@@ -74,8 +74,7 @@ public function __construct($collection)
      *
      * @return void
      */
-    #[\ReturnTypeWillChange]
-    public function rewind()
+    public function rewind(): void
     {
         $this->index = 0;
         $i = $this->index;
@@ -89,8 +88,7 @@ public function rewind()
      *
      * @return integer
      */
-    #[\ReturnTypeWillChange]
-    public function key()
+    public function key(): mixed
     {
         return $this->key;
     }
@@ -100,8 +98,7 @@ public function key()
      *
      * @return Doctrine_Record
      */
-    #[\ReturnTypeWillChange]
-    public function current()
+    public function current(): mixed
     {
         return $this->collection->get($this->key);
     }
@@ -111,13 +108,12 @@ public function current()
      *
      * @return void
      */
-    #[\ReturnTypeWillChange]
-    public function next()
+    public function next(): void
     {
         $this->index++;
         $i = $this->index;
         if (isset($this->keys[$i])) {
             $this->key   = $this->keys[$i];
         }
     }
-}
+}
@@ -64,8 +64,7 @@ private function _hydrateCurrent()
         }
     }
 
-    #[\ReturnTypeWillChange]
-    public function rewind()
+    public function rewind(): void
     {
         $this->index = 0;
         $this->_stmt->closeCursor();
@@ -74,32 +73,28 @@ public function rewind()
         $this->_hydrateCurrent();
     }
 
-    #[\ReturnTypeWillChange]
-    public function key()
+    public function key(): mixed
     {
         return $this->index;
     }
 
-    #[\ReturnTypeWillChange]
-    public function current()
+    public function current(): mixed
     {
         return $this->_current;
     }
 
-    #[\ReturnTypeWillChange]
-    public function next()
+    public function next(): void
     {
         $this->_current = null;
         $this->index++;
         $this->_hydrateCurrent();
     }
 
-    #[\ReturnTypeWillChange]
-    public function valid()
+    public function valid(): bool
     {
-        if ( ! is_null($this->_current) && $this->_current !== false) {
+        if (!is_null($this->_current) && $this->_current !== false) {
             return true;
         }
         return false;
     }
-}
+}
@@ -57,8 +57,8 @@ class Doctrine_Connection_Profiler implements Doctrine_Overloadable, IteratorAgg
     /**
      * constructor
      */
-    public function __construct() {
-
+    public function __construct()
+    {
     }
 
     /**
@@ -67,9 +67,10 @@ public function __construct() {
      * @param integer $filter
      * @return boolean
      */
-    public function setFilterQueryType() {
-
+    public function setFilterQueryType()
+    {
     }
+
     /**
      * method overloader
      * this method is used for invoking different listeners, for the full
@@ -83,7 +84,7 @@ public function setFilterQueryType() {
     public function __call($m, $a)
     {
         // first argument should be an instance of Doctrine_Event
-        if ( ! ($a[0] instanceof Doctrine_Event)) {
+        if (!($a[0] instanceof Doctrine_Event)) {
             throw new Doctrine_Connection_Profiler_Exception("Couldn't listen event. Event should be an instance of Doctrine_Event.");
         }
 
@@ -93,7 +94,7 @@ public function __call($m, $a)
             $a[0]->start();
 
             $eventSequence = $a[0]->getSequence();
-            if ( ! isset($this->eventSequences[$eventSequence])) {
+            if (!isset($this->eventSequences[$eventSequence])) {
                 $this->events[] = $a[0];
                 $this->eventSequences[$eventSequence] = true;
             }
@@ -109,7 +110,7 @@ public function __call($m, $a)
      * @param mixed $key
      * @return Doctrine_Event|null
      */
-    public function get($key)
+    public function get($key): ?Doctrine_Event
     {
         if (isset($this->events[$key])) {
             return $this->events[$key];
@@ -123,7 +124,7 @@ public function get($key)
      *
      * @return Doctrine_Event[] All events in an array
      */
-    public function getAll()
+    public function getAll(): array
     {
         return $this->events;
     }
@@ -156,11 +157,10 @@ public function count()
      *
      * @return Doctrine_Event|null
      */
-    public function pop()
+    public function pop(): ?Doctrine_Event
     {
         $event = array_pop($this->events);
-        if ($event !== null)
-        {
+        if ($event !== null) {
             unset($this->eventSequences[$event->getSequence()]);
         }
         return $event;
@@ -181,4 +181,4 @@ public function lastEvent()
         end($this->events);
         return current($this->events);
     }
-}
+}
@@ -98,7 +98,7 @@ public function connect()
 
         $connected = parent::connect();
 
-        if(!$hasConfigureStringify) {
+        if (!$hasConfigureStringify) {
             // PHP8.1 require default to true to keep BC
             // https://www.php.net/manual/en/migration81.incompatible.php#migration81.incompatible.pdo.sqlite
             // Can be overwritten by user later
@@ -144,4 +144,4 @@ public function dropDatabase()
 
         $this->export->dropDatabase($info['database']);
     }
-}
+}
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public function __construct($table, $keyColumn = null)`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`if ($keyColumn === null) {`
`94`		`- $keyColumn = $table->getAttribute(Doctrine_Core::ATTR_COLL_KEY);`
	`94`	`+ $keyColumn = $table->getAttribute(Doctrine_Core::ATTR_COLL_KEY);`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`if ($keyColumn !== null) {`
`@@ -152,15 +152,15 @@ public function serialize()`
`152`	`152`	`{`
`153`	`153`	`$vars = $this->__serialize();`
`154`	`154`
`155`		`- return serialize($vars);`
	`155`	`+ return $vars;`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`/**`
`159`		`- * This method is automatically called everytime a Doctrine_Collection object is unserialized`
	`159`	`+ * Unserializes a Doctrine_Collection instance for php 7.4+`
`160`	`160`	`*`
`161`		`- * @return void`
	`161`	`+ * @param string $serialized A serialized Doctrine_Collection instance`
`162`	`162`	`*/`
`163`		`- public function unserialize($serialized)`
	`163`	`+ public function __unserialize($data)`
`164`	`164`	`{`
`165`	`165`	`$array = unserialize($serialized);`
`166`	`166`
Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,7 @@ public function __construct($collection)`
`74`	`74`	`*`
`75`	`75`	`* @return void`
`76`	`76`	`*/`
`77`		`- #[\ReturnTypeWillChange]`
`78`		`- public function rewind()`
	`77`	`+ public function rewind(): void`
`79`	`78`	`{`
`80`	`79`	`$this->index = 0;`
`81`	`80`	`$i = $this->index;`
`@@ -89,8 +88,7 @@ public function rewind()`
`89`	`88`	`*`
`90`	`89`	`* @return integer`
`91`	`90`	`*/`
`92`		`- #[\ReturnTypeWillChange]`
`93`		`- public function key()`
	`91`	`+ public function key(): mixed`
`94`	`92`	`{`
`95`	`93`	`return $this->key;`
`96`	`94`	`}`
`@@ -100,8 +98,7 @@ public function key()`
`100`	`98`	`*`
`101`	`99`	`* @return Doctrine_Record`
`102`	`100`	`*/`
`103`		`- #[\ReturnTypeWillChange]`
`104`		`- public function current()`
	`101`	`+ public function current(): mixed`
`105`	`102`	`{`
`106`	`103`	`return $this->collection->get($this->key);`
`107`	`104`	`}`
`@@ -111,13 +108,12 @@ public function current()`
`111`	`108`	`*`
`112`	`109`	`* @return void`
`113`	`110`	`*/`
`114`		`- #[\ReturnTypeWillChange]`
`115`		`- public function next()`
	`111`	`+ public function next(): void`
`116`	`112`	`{`
`117`	`113`	`$this->index++;`
`118`	`114`	`$i = $this->index;`
`119`	`115`	`if (isset($this->keys[$i])) {`
`120`	`116`	`$this->key = $this->keys[$i];`
`121`	`117`	`}`
`122`	`118`	`}`
`123`		`-}`
	`119`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,7 @@ private function _hydrateCurrent()`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`- #[\ReturnTypeWillChange]`
`68`		`- public function rewind()`
	`67`	`+ public function rewind(): void`
`69`	`68`	`{`
`70`	`69`	`$this->index = 0;`
`71`	`70`	`$this->_stmt->closeCursor();`
`@@ -74,32 +73,28 @@ public function rewind()`
`74`	`73`	`$this->_hydrateCurrent();`
`75`	`74`	`}`
`76`	`75`
`77`		`- #[\ReturnTypeWillChange]`
`78`		`- public function key()`
	`76`	`+ public function key(): mixed`
`79`	`77`	`{`
`80`	`78`	`return $this->index;`
`81`	`79`	`}`
`82`	`80`
`83`		`- #[\ReturnTypeWillChange]`
`84`		`- public function current()`
	`81`	`+ public function current(): mixed`
`85`	`82`	`{`
`86`	`83`	`return $this->_current;`
`87`	`84`	`}`
`88`	`85`
`89`		`- #[\ReturnTypeWillChange]`
`90`		`- public function next()`
	`86`	`+ public function next(): void`
`91`	`87`	`{`
`92`	`88`	`$this->_current = null;`
`93`	`89`	`$this->index++;`
`94`	`90`	`$this->_hydrateCurrent();`
`95`	`91`	`}`
`96`	`92`
`97`		`- #[\ReturnTypeWillChange]`
`98`		`- public function valid()`
	`93`	`+ public function valid(): bool`
`99`	`94`	`{`
`100`		`- if ( ! is_null($this->_current) && $this->_current !== false) {`
	`95`	`+ if (!is_null($this->_current) && $this->_current !== false) {`
`101`	`96`	`return true;`
`102`	`97`	`}`
`103`	`98`	`return false;`
`104`	`99`	`}`
`105`		`-}`
	`100`	`+}`