Merge pull request #208 from moufmouf/merge51

Porting 5.1 changes into master

Author: moufmouf

.gitignore

@@ -17,4 +17,4 @@ vendor/*
 /phpbench.sh
 /xdebug/
 .php_cs.cache
-tdbm.lock.yml
+tdbm.lock.yml

.scrutinizer.yml

@@ -1,7 +1,7 @@
 build:
     environment:
         php:
-            version: 7.1
+            version: 7.4
     nodes:
         analysis:
             project_setup:

.travis.yml

@@ -1,108 +1,108 @@
 language: php
 php:
-- 7.1
+  - 7.1
 cache:
   directories:
     - $HOME/.composer/cache
 matrix:
   include:
-    - php: 7.2
-      env: PREFER_LOWEST="" DB=mysql RUN_PHPSTAN=1 RUN_CSCHECK=1 RUN_REQUIRECHECKER=1 RUN_PERF_TEST=1
+    - php: 7.4
+      env: PREFER_LOWEST="" DB=mysql NO_WEAKREF=1 RUN_PHPSTAN=1 RUN_CSCHECK=1 RUN_REQUIRECHECKER=1 RUN_PERF_TEST=1
       services:
         - mysql
     - php: 7.3
       env: PREFER_LOWEST="" DB=mysql NO_WEAKREF=1
       services:
         - mysql
-    - php: 7.1
-      env: PREFER_LOWEST="" DB=mysql COVERALLS=true
+    - php: 7.4
+      env: PREFER_LOWEST="" DB=mysql NO_WEAKREF=1 COVERALLS=true
       services:
         - mysql
-    - php: 7.1
+    - php: 7.2
       env: PREFER_LOWEST="--prefer-lowest" DB=mysql
       services:
         - mysql
-    - php: 7.1
+    - php: 7.2
       env: PREFER_LOWEST="" DB=mysql8
       sudo: required
       services:
-      - docker
-    - php: 7.1
+        - docker
+    - php: 7.2
       env: PREFER_LOWEST="" DB=mariadb
       addons:
         mariadb: '10.3'
-    - php: 7.1
+    - php: 7.2
       env: PREFER_LOWEST="--prefer-lowest" DB=mariadb
       addons:
         mariadb: '10.3'
-    - php: 7.1
+    - php: 7.2
       env: PREFER_LOWEST="--prefer-lowest" DB=oracle PHPUNITFILE="-c phpunit.oracle.xml"
       sudo: required
       services:
         - docker
-    - php: 7.1
+    - php: 7.2
       env: PREFER_LOWEST="" DB=oracle PHPUNITFILE="-c phpunit.oracle.xml"
       sudo: required
       services:
         - docker
-    - php: 7.1
+    - php: 7.2
       env: PREFER_LOWEST="--prefer-lowest" DB=postgres PHPUNITFILE="-c phpunit.postgres.xml"
       addons:
         postgresql: "9.6"
       services:
         - postgresql
-    - php: 7.1
+    - php: 7.2
       env: PREFER_LOWEST="" DB=postgres PHPUNITFILE="-c phpunit.postgres.xml"
       addons:
         postgresql: "9.6"
       services:
         - postgresql
   allow_failures:
-    - php: 7.1
+    - php: 7.2
       env: PREFER_LOWEST="" DB=oracle PHPUNITFILE="-c phpunit.oracle.xml"
-    - php: 7.1
+    - php: 7.2
       env: PREFER_LOWEST="--prefer-lowest" DB=oracle PHPUNITFILE="-c phpunit.oracle.xml"
 env:
   global:
-  - GIT_NAME: "'Couscous auto deploy'"
-  - GIT_EMAIL: [email protected]
-  - GH_REF: github.com/thecodingmachine/tdbm
-  - secure: pAdXEBkhe0KJbbZEP61lcZzvKKMkVK2RDIZTf1RzjQRgk+PxIG5JLBiHKuvG3MgtFjZbdtl2Vf6nAZbeMyy3H0eCryQCjjqdb5mS3eDekJ4WwviN6hQDc7+Xw6R1saHvDvJs9GQENUzHPWfAfY7LuwUgHXdc+BCLZmV+j0H6liZMNlXIYqP1kdwl7u5a/Y3FvXFws6R7A0giUBCb4HOYkInaXV0yzuAEsB6XBDbTjw3EqI0GBs6746O4tn7NOGaFlFSZan6RZe6jEkw7A+U3xLCfFnIN2q1uk/tk511KkOcSFQyGKRMDSKRDesdMQaOt/ze14+t+ISTqOSn8bUrCBhpj4VsjvzZE0FOS3WWGXpayODqdxuDjacwCZwiOHG7FWbwyQ3APiIrfO82ABbI8HoJURbgOb/Qnl2iPg9tCcvDqhsHxppGq5oOyhBq+GGtucOTW6lO6QnlMaez4nJJ7a3cn8WJB6NxaCZLii3aOXSLMahzFCcQxtq9/WfKwbOtf4GWUSLk28kDMov5h7tzuuHXmzOivzRxztQ9WC2GT7eMCIL8mvWFRMNiLJTE03J0ZbQDZ9N4OU3tdcgjV+d6pU6bu4SrCFtjCJnLaeLfIjoHkx+kK+kyCOQpOcuHMM6zq8l+ztd7VGZ3Br8HJTs1CxiWXrs+JIx2i8V06IE8nLKA=
+    - GIT_NAME: "'Couscous auto deploy'"
+    - GIT_EMAIL: [email protected]
+    - GH_REF: github.com/thecodingmachine/tdbm
+    - secure: pAdXEBkhe0KJbbZEP61lcZzvKKMkVK2RDIZTf1RzjQRgk+PxIG5JLBiHKuvG3MgtFjZbdtl2Vf6nAZbeMyy3H0eCryQCjjqdb5mS3eDekJ4WwviN6hQDc7+Xw6R1saHvDvJs9GQENUzHPWfAfY7LuwUgHXdc+BCLZmV+j0H6liZMNlXIYqP1kdwl7u5a/Y3FvXFws6R7A0giUBCb4HOYkInaXV0yzuAEsB6XBDbTjw3EqI0GBs6746O4tn7NOGaFlFSZan6RZe6jEkw7A+U3xLCfFnIN2q1uk/tk511KkOcSFQyGKRMDSKRDesdMQaOt/ze14+t+ISTqOSn8bUrCBhpj4VsjvzZE0FOS3WWGXpayODqdxuDjacwCZwiOHG7FWbwyQ3APiIrfO82ABbI8HoJURbgOb/Qnl2iPg9tCcvDqhsHxppGq5oOyhBq+GGtucOTW6lO6QnlMaez4nJJ7a3cn8WJB6NxaCZLii3aOXSLMahzFCcQxtq9/WfKwbOtf4GWUSLk28kDMov5h7tzuuHXmzOivzRxztQ9WC2GT7eMCIL8mvWFRMNiLJTE03J0ZbQDZ9N4OU3tdcgjV+d6pU6bu4SrCFtjCJnLaeLfIjoHkx+kK+kyCOQpOcuHMM6zq8l+ztd7VGZ3Br8HJTs1CxiWXrs+JIx2i8V06IE8nLKA=
 before_script:
-- composer update --prefer-dist
-# For some reason, $PREFER_LOWEST will fail unless a composer update has been run before...
-- if [ "$PREFER_LOWEST" = "--prefer-lowest" ] ; then composer update --prefer-dist --prefer-lowest; fi
-- if [ -z "$NO_WEAKREF" ] ; then pecl install weakref-beta; fi
+  - composer update --prefer-dist
+  # For some reason, $PREFER_LOWEST will fail unless a composer update has been run before...
+  - if [ "$PREFER_LOWEST" = "--prefer-lowest" ] ; then composer update --prefer-dist --prefer-lowest; fi
+  - if [ -z "$NO_WEAKREF" ] ; then pecl install weakref-beta; fi
 script:
-# Let's run the Oracle script only when the password is available (it is not available in forks unfortunately)
-- |
-  if [[ "$COVERALLS" != "true" ]] ; then export NO_COVERAGE="--no-coverage"; fi;
-  if [ "$DB" == "oracle" ] ; then
-    docker run -v $(pwd):/app -v $(pwd)/tests/Fixtures/oracle-startup.sql:/docker-entrypoint-initdb.d/oracle-startup.sql moufmouf/oracle-xe-php vendor/bin/phpunit $PHPUNITFILE $NO_COVERAGE;
-  elif [ "$DB" == "mysql8" ] ; then
-    sudo /etc/init.d/mysql stop;
-    tests/phpunit-mysql8.sh
-  else
-    echo ./vendor/bin/phpunit $PHPUNITFILE $NO_COVERAGE;
-    ./vendor/bin/phpunit $PHPUNITFILE $NO_COVERAGE;
-  fi
-- |
-  if [ "$RUN_CSCHECK" == "1" ] ; then
-    composer cscheck
-  fi
-- |
-  if [ "$RUN_PHPSTAN" == "1" ] ; then
-    composer phpstan
-  fi
-- |
-  if [ "$RUN_REQUIRECHECKER" == "1" ] ; then
-    composer require-checker
-  fi
-- |
-  if [ "$RUN_PERF_TEST" == "1" ] ; then
-    echo "***** Running PHPBENCH on current branch *****" && \
-    ./phpbench.dist.sh run --tag=current_pr --store
-  fi
+  # Let's run the Oracle script only when the password is available (it is not available in forks unfortunately)
+  - |
+    if [[ "$COVERALLS" != "true" ]] ; then export NO_COVERAGE="--no-coverage"; fi;
+    if [ "$DB" == "oracle" ] ; then
+      docker run -v $(pwd):/app -v $(pwd)/tests/Fixtures/oracle-startup.sql:/docker-entrypoint-initdb.d/oracle-startup.sql moufmouf/oracle-xe-php vendor/bin/phpunit $PHPUNITFILE $NO_COVERAGE;
+    elif [ "$DB" == "mysql8" ] ; then
+      sudo /etc/init.d/mysql stop;
+      tests/phpunit-mysql8.sh
+    else
+      echo ./vendor/bin/phpunit $PHPUNITFILE $NO_COVERAGE;
+      ./vendor/bin/phpunit $PHPUNITFILE $NO_COVERAGE;
+    fi
+  - |
+    if [ "$RUN_CSCHECK" == "1" ] ; then
+      composer cscheck
+    fi
+  - |
+    if [ "$RUN_PHPSTAN" == "1" ] ; then
+      composer phpstan
+    fi
+  - |
+    if [ "$RUN_REQUIRECHECKER" == "1" ] ; then
+      composer require-checker
+    fi
+  - |
+    if [ "$RUN_PERF_TEST" == "1" ] ; then
+      echo "***** Running PHPBENCH on current branch *****" && \
+      ./phpbench.dist.sh run --tag=current_pr --store
+    fi
 after_success:
   - |
     if [ "$RUN_PERF_TEST" == "1" ] && [ "${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}" != "master" ] ; then
@@ -114,5 +114,5 @@ after_success:
       ./phpbench.dist.sh report --uuid=tag:current_pr --uuid=tag:master --report='{extends: compare, compare: tag}'
     fi
 after_script:
-- if [ "$COVERALLS" = "true" ] ; then ./vendor/bin/php-coveralls -v; fi
-- if [ "$COVERALLS" = "true" ] ; then vendor/bin/couscous travis-auto-deploy --php-version=7.1 -vvv; fi
+  - if [ "$COVERALLS" = "true" ] ; then ./vendor/bin/php-coveralls -v; fi
+  - if [ "$COVERALLS" = "true" ] ; then vendor/bin/couscous travis-auto-deploy --php-version=7.2 -vvv; fi

composer-require-checker.json

@@ -3,7 +3,7 @@
     "null", "true", "false",
     "static", "self", "parent",
     "array", "string", "int", "float", "bool", "iterable", "callable", "void", "object",
-    "WeakRef",
+    "WeakRef", "WeakReference",
     "TheCodingMachine\\TDBM\\Fixtures\\Interfaces\\TestUserDaoInterface",
     "TheCodingMachine\\TDBM\\Fixtures\\Traits\\TestUserDaoTrait",
     "TheCodingMachine\\TDBM\\Fixtures\\Interfaces\\TestUserInterface",

composer.json

@@ -18,8 +18,8 @@
         }
     ],
     "require" : {
-        "php" : ">=7.1",
-        "mouf/magic-query" : "^1.4.0",
+        "php" : ">=7.2",
+        "mouf/magic-query" : "^1.4",
         "mouf/schema-analyzer": "^1.1.4",
         "doctrine/dbal": "^2.9.2",
         "psr/log": "~1.0",
@@ -32,25 +32,26 @@
         "mouf/utils.log.psr.multi-logger": "^1.0",
         "symfony/filesystem": "^2.7 || ^3 || ^4 || ^5",
         "ramsey/uuid": "^3.7",
-        "doctrine/annotations": "^1.6",
+        "doctrine/annotations": "^1.10",
         "zendframework/zend-code": "^3.4",
         "psr/container": "^1",
+        "brain-diminished/schema-version-control": "^1.0.2",
         "ext-PDO": "*",
         "ext-json": "*",
         "ext-hash": "*",
         "ext-filter": "*",
-        "brain-diminished/schema-version-control": "^1.0.2"
+        "ext-intl": "*"
     },
     "require-dev" : {
-        "phpunit/phpunit": "^7.4.4 || ^8.0.0",
+        "phpunit/phpunit": "^8.5.8",
         "php-coveralls/php-coveralls": "^2.1",
         "wa72/simplelogger" : "^1.0",
-        "friendsofphp/php-cs-fixer": "^2.15.1",
+        "friendsofphp/php-cs-fixer": "^2.16.4",
         "symfony/process": "^3 || ^4 || ^5",
         "thecodingmachine/tdbm-fluid-schema-builder": "^1.0.0",
-        "phpstan/phpstan": "^0.11.5",
-        "thecodingmachine/phpstan-strict-rules": "^0.11.0",
-        "bamarni/composer-bin-plugin": "^1.2",
+        "phpstan/phpstan": "^0.11.19",
+        "thecodingmachine/phpstan-strict-rules": "^0.11.2",
+        "bamarni/composer-bin-plugin": "^1.4.1",
         "phpbench/phpbench": "^0.16.10"
     },
     "conflict": {

doc/install_service-provider.md

@@ -18,7 +18,7 @@ In this document, we will describe integration of TDBM 5 with [Simplex](https://
     }
   },
   "require": {
-    "php": ">=7.1",
+    "php": ">=7.2",
     "mnapoli/simplex": "^0.4.1",
     "thecodingmachine/tdbm-universal-provider": "^5",
     "thecodingmachine/discovery": "^1.2"

phpstan.neon

@@ -13,6 +13,10 @@ parameters:
      #- "#expects array<string>, array<int, int|string> given.#"
      - "/Parameter #. \\$types of method Doctrine\\\\DBAL\\\\Connection::.*() expects array<int|string>, array<int, Doctrine\\\\DBAL\\\\Types\\\\Type> given./"
      - "#Method TheCodingMachine\\\\TDBM\\\\Schema\\\\ForeignKey::.*() should return .* but returns array<string>|string.#"
+     - '#Method TheCodingMachine\\TDBM\\NativeWeakrefObjectStorage::get\(\) should return TheCodingMachine\\TDBM\\DbRow\|null but returns object\|null.#'
+     -
+             message: '#WeakRef#'
+             path: src/WeakrefObjectStorage.php
      -
         message: '#Result of && is always false.#'
         path: src/Test/Dao/Bean/Generated/ArticleBaseBean.php

src/InnerResultArray.php

@@ -102,7 +102,7 @@ private function toIndex($offset): void
         }
     }
 
-    public function next()
+    public function next(): void
     {
         // Let's overload the next() method to store the result.
         if (isset($this->results[$this->key + 1])) {

src/InnerResultIterator.php

@@ -106,7 +106,7 @@ protected function executeQuery(): void
 
         $this->logger->debug('Running SQL request: '.$sql);
 
-        $this->statement = $this->tdbmService->getConnection()->executeQuery($sql, $this->parameters, DbalUtils::generateArrayTypes($this->parameters));
+        $this->statement = $this->tdbmService->getConnection()->executeQuery($sql, $this->parameters, DbalUtils::generateTypes($this->parameters));
 
         $this->fetchStarted = true;
     }
@@ -140,7 +140,7 @@ private function getRowCountViaSqlQuery(): int
 
         $this->logger->debug('Running count SQL request: '.$countSql);
 
-        $this->count = (int) $this->tdbmService->getConnection()->fetchColumn($countSql, $this->parameters, 0, DbalUtils::generateArrayTypes($this->parameters));
+        $this->count = (int) $this->tdbmService->getConnection()->fetchColumn($countSql, $this->parameters, 0, DbalUtils::generateTypes($this->parameters));
         return $this->count;
     }
 
@@ -168,17 +168,21 @@ public function key()
      * Advances the cursor to the next result.
      * Casts the database result into one (or several) beans.
      */
-    public function next()
+    public function next(): void
     {
         $row = $this->statement->fetch(\PDO::FETCH_ASSOC);
         if ($row) {
 
             // array<tablegroup, array<table, array<column, value>>>
             $beansData = [];
+            $allNull = true;
             foreach ($row as $key => $value) {
                 if (!isset($this->columnDescriptors[$key])) {
                     continue;
                 }
+                if ($allNull !== false && $value !== null) {
+                    $allNull = false;
+                }
 
                 $columnDescriptor = $this->columnDescriptors[$key];
 
@@ -192,6 +196,10 @@ public function next()
 
                 $beansData[$columnDescriptor['tableGroup']][$columnDescriptor['table']][$columnDescriptor['column']] = $value;
             }
+            if ($allNull === true) {
+                $this->next();
+                return;
+            }
 
             $reflectionClassCache = [];
             $firstBean = true;