try and merge in propelorm#1086

.travis.yml

@@ -3,15 +3,17 @@ language: php
 services:
   - mysql
 
+#services: docker
+
 branches:
   only:
     - master
 
 php:
-  - 5.6
   - 7.0
   - 7.1
   - 7.2
+  - 7.4
 
 env:
   - DB=mysql DB_USER=root
@@ -29,3 +31,5 @@ before_script:
 
 script: vendor/bin/phpunit
 
+#script:
+#  bash docker/run.sh

composer.json

@@ -14,18 +14,25 @@
   },
   "include-path": ["runtime/lib", "generator/lib"],
   "require": {
-    "php": ">=5.2.4",
+    "php": "^7.1",
     "phing/phing": "~2.4"
+
   },
   "require-dev": {
     "pear-pear.php.net/pear_packagefilemanager2" : "@stable",
-    "phpunit/phpunit": "~4.0||~5.0"
+    "phpunit/phpunit": "~8|~9",
+    "phpcompatibility/php-compatibility": "^9.3",
+    "squizlabs/php_codesniffer": "^3.5"
   },
   "repositories": [
     {
       "type": "pear",
       "url": "https://pear.php.net"
     }
   ],
-  "bin": ["generator/bin/propel-gen", "generator/bin/propel-gen.bat"]
+  "bin": ["generator/bin/propel-gen", "generator/bin/propel-gen.bat"],
+  "scripts": {
+    "post-install-cmd": "\"vendor/bin/phpcs\" --config-set installed_paths vendor/phpcompatibility/php-compatibility",
+    "post-update-cmd" : "\"vendor/bin/phpcs\" --config-set installed_paths vendor/phpcompatibility/php-compatibility"
+  }
 }

docker/Dockerfile

@@ -0,0 +1,11 @@
+FROM thecodingmachine/php:7.4-v3-cli
+USER root
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y locales
+
+RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
+    dpkg-reconfigure --frontend=noninteractive locales && \
+    update-locale LANG=en_US.UTF-8
+
+USER docker
+ENV LANG en_US.UTF-8
+

docker/docker-compose.yml

@@ -0,0 +1,26 @@
+version: '3'
+services:
+  php:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    working_dir: /usr/src/app
+    command: phpunit
+    volumes:
+      - ../:/usr/src/app
+    environment:
+      - PHP_EXTENSIONS=intl pdo_sqlite sqlite3
+      - STARTUP_COMMAND_1=composer install
+      - STARTUP_COMMAND_2=bash test/reset_tests.sh
+
+  db:
+    image: percona
+    command: >
+      mysqld
+      --sql-mode="NO_ENGINE_SUBSTITUTION"
+      --character-set-server="utf8"
+      --collation-server="utf8_unicode_ci"
+      --default-authentication-plugin=mysql_native_password
+    restart: always
+    environment:
+      MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'

docker/reset.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+mysql -u root -e 'SET FOREIGN_KEY_CHECKS = 0; DROP DATABASE IF EXISTS test; DROP SCHEMA IF EXISTS second_hand_books; DROP SCHEMA IF EXISTS contest; DROP DATABASE IF EXISTS reverse_bookstore; DROP SCHEMA IF EXISTS bookstore_schemas; SET FOREIGN_KEY_CHECKS = 1;'
+mysql -u root -e 'CREATE DATABASE test; CREATE SCHEMA bookstore_schemas; CREATE SCHEMA contest; CREATE SCHEMA second_hand_books; CREATE DATABASE reverse_bookstore;'

docker/run.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+cd docker
+docker-compose up -d db
+sleep 20
+docker-compose exec -T db bash < reset.sh
+docker-compose build
+docker-compose run php

generator/lib/builder/om/PHP5ObjectBuilder.php

@@ -1411,6 +1411,9 @@ protected function addLazyLoaderBody(&$script, Column $col)
         try {
             \$stmt = " . $this->getPeerClassname() . "::doSelectStmt(\$c, \$con);
             \$row = \$stmt->fetch(PDO::FETCH_NUM);
+            if (\$row === false) {
+                \$row = [null]; // for backward compatibility
+            }
             \$stmt->closeCursor();";
         }
 

generator/lib/builder/om/PHP5ObjectNoCollectionBuilder.php

@@ -111,6 +111,9 @@ protected function addLazyLoaderBody(&$script, Column $col)
         try {
             \$stmt = " . $this->getPeerClassname() . "::doSelectStmt(\$c, \$con);
             \$row = \$stmt->fetch(PDO::FETCH_NUM);
+            if (\$row === false) {
+                \$row = [null]; // for backward compatibility
+            }
             \$stmt->closeCursor();";
 
         if ($col->getType() === PropelTypes::CLOB && $this->getPlatform() instanceof OraclePlatform) {

generator/lib/model/Index.php

@@ -181,7 +181,7 @@ public function addColumn($data)
             }
         } else {
             $attrib = $data;
-            $name = $attrib["name"];
+            $name = $attrib["name"] ?? null;
             $this->indexColumns[] = $name;
             if (isset($attrib["size"])) {
                 $this->indexColumnSizes[$name] = $attrib["size"];

generator/lib/platform/DefaultPlatform.php

@@ -1182,7 +1182,7 @@ public function getPhpArrayString($stringValue)
             $values[] = trim($v);
         }
 
-        $value = implode($values, ' | ');
+        $value = implode(' | ', $values);
         if (empty($value) || ' | ' === $value) {
             return null;
         }

phpunit.xml.dist

@@ -8,7 +8,7 @@
     convertWarningsToExceptions="true"
     processIsolation="false"
     stopOnFailure="false"
-    syntaxCheck="false"
+    beStrictAboutTestsThatDoNotTestAnything="false"
     bootstrap="test/bootstrap.php"
     >
 

runtime/lib/formatter/PropelArrayFormatter.php

@@ -32,14 +32,21 @@ public function format(PDOStatement $stmt)
         } else {
             $collection = array();
         }
+
+        /**
+         * @var $collection PropelArrayCollection
+         */
+
         if ($this->isWithOneToMany() && $this->hasLimit) {
             throw new PropelException('Cannot use limit() in conjunction with with() on a one-to-many relationship. Please remove the with() call, or the limit() call.');
         }
-        $items = [];
+
+        $data = [];
+
         while ($row = $stmt->fetch(PDO::FETCH_NUM)) {
             $object = &$this->getStructuredArrayFromRow($row);
             if ($object) {
-                $items[] =& $object;
+                $data[] = &$object;
             }
         }
 
@@ -50,6 +57,8 @@ public function format(PDOStatement $stmt)
         $this->alreadyHydratedObjects = array();
         $stmt->closeCursor();
 
+        $collection->setData($data);
+
         return $collection;
     }
 

runtime/lib/map/TableMap.php

@@ -786,9 +786,10 @@ public function setPrefix($prefix)
      */
     protected function hasPrefix($data)
     {
-        if(!$this->prefix) {
+        if (!$this->prefix) {
             return false;
         }
+
         return (strpos($data, $this->prefix) === 0);
     }
 

runtime/lib/parser/yaml/sfYamlInline.php

@@ -37,10 +37,8 @@ public static function load($value)
       return '';
     }
 
-    if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
-      $mbEncoding = mb_internal_encoding();
-      mb_internal_encoding('ASCII');
-    }
+    $mbEncoding = mb_internal_encoding();
+    mb_internal_encoding('ASCII');
 
     switch ($value[0]) {
       case '[':
@@ -124,10 +122,8 @@ protected static function dumpArray($value)
   {
     // array
     $keys = array_keys($value);
-    if (
-      (1 == count($keys) && '0' == $keys[0])
-      ||
-      (count($keys) > 1 && array_reduce($keys, create_function('$v,$w', 'return (integer) $v + $w;'), 0) == count($keys) * (count($keys) - 1) / 2))
+
+    if (count($value) > 0 && array_values($value) === $value)
     {
       $output = array();
       foreach ($value as $val) {

runtime/lib/parser/yaml/sfYamlParser.php

@@ -56,10 +56,8 @@ public function parse($value)
     $this->currentLine = '';
     $this->lines = explode("\n", $this->cleanup($value));
 
-    if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
-      $mbEncoding = mb_internal_encoding();
-      mb_internal_encoding('UTF-8');
-    }
+    $mbEncoding = mb_internal_encoding();
+    mb_internal_encoding('UTF-8');
 
     $data = array();
     while ($this->moveToNextLine()) {

runtime/lib/validator/NotMatchValidator.php

@@ -48,7 +48,7 @@ class NotMatchValidator implements BasicValidator
     private function prepareRegexp($exp)
     {
         // remove surrounding '/' marks so that they don't get escaped in next step
-        if ($exp{0} !== '/' || $exp{strlen($exp) - 1} !== '/') {
+        if ($exp[0] !== '/' || $exp[strlen($exp) - 1] !== '/') {
             $exp = '/' . $exp . '/';
         }
 

test/fixtures/bookstore/build.properties

@@ -12,7 +12,7 @@
 
 propel.project = bookstore
 propel.database = mysql
-propel.database.url = mysql:dbname=test
+propel.database.url = mysql:host=db;dbname=test
 propel.mysql.tableType = InnoDB
 propel.disableIdentifierQuoting = true
 propel.schema.autoPrefix = true

test/fixtures/bookstore/runtime-conf.xml

@@ -16,7 +16,7 @@
 				<!-- Connection parameters. See PDO documentation for DSN format and available option constants. -->
 				<connection>
 					<classname>DebugPDO</classname>
-					<dsn>mysql:dbname=test</dsn>
+					<dsn>mysql:host=db;dbname=test</dsn>
 					<!--
 					For MySQL and Oracle you must specify username + password separate from DSN:
 					-->
@@ -51,7 +51,7 @@
 				<adapter>mysql</adapter>
 				<connection>
 					<classname>DebugPDO</classname>
-					<dsn>mysql:dbname=test</dsn>
+					<dsn>mysql:host=db;dbname=test</dsn>
 					<!--
 					For MySQL and Oracle you must specify username + password separate from DSN:
 					-->
@@ -73,7 +73,7 @@
 				<adapter>mysql</adapter>
 				<connection>
 					<classname>DebugPDO</classname>
-					<dsn>mysql:dbname=test</dsn>
+					<dsn>mysql:host=db;dbname=test</dsn>
 					<!--
 					For MySQL and Oracle you must specify username + password separate from DSN:
 					-->

test/fixtures/namespaced/build.properties

@@ -12,7 +12,7 @@
 
 propel.project = bookstore_namespaced
 propel.database = mysql
-propel.database.url = mysql:dbname=test
+propel.database.url = mysql:host=db;dbname=test
 propel.mysql.tableType = InnoDB
 propel.disableIdentifierQuoting=true
 

test/fixtures/namespaced/runtime-conf.xml

@@ -16,7 +16,7 @@
 				<!-- Connection parameters. See PDO documentation for DSN format and available option constants. -->
 				<connection>
 					<classname>DebugPDO</classname>
-					<dsn>mysql:dbname=test</dsn>
+					<dsn>mysql:host=db;dbname=test</dsn>
 					<!--
 					For MySQL and Oracle you must specify username + password separate from DSN:
 					-->

test/fixtures/reverse/mysql/build.properties

@@ -13,7 +13,7 @@
 propel.project = reverse_bookstore
 
 propel.database = mysql
-propel.database.url = mysql:dbname=reverse_bookstore
+propel.database.url = mysql:host=db;dbname=reverse_bookstore
 
 # For MySQL or Oracle, you also need to specify username & password
 propel.database.user = root

test/fixtures/reverse/mysql/runtime-conf.xml

@@ -14,7 +14,7 @@
 				<adapter>mysql</adapter>
 				<connection>
 					<classname>DebugPDO</classname>
-					<dsn>mysql:dbname=reverse_bookstore</dsn>
+					<dsn>mysql:host=db;dbname=reverse_bookstore</dsn>
 					<!--
 					For MySQL and Oracle you must specify username + password separate from DSN:
 					-->

test/fixtures/schemas/build.properties

@@ -12,7 +12,7 @@
 
 propel.project = bookstore
 propel.database = mysql
-propel.database.url = mysql:dbname=test
+propel.database.url = mysql:host=db;dbname=test
 propel.database.user = root
 propel.mysql.tableType = InnoDB
 propel.disableIdentifierQuoting = true

test/fixtures/schemas/runtime-conf.xml

@@ -14,7 +14,7 @@
 				<adapter>mysql</adapter>
 				<connection>
 					<classname>DebugPDO</classname>
-					<dsn>mysql:dbname=test</dsn>
+					<dsn>mysql:host=db;dbname=test</dsn>
 					<!--
 					For MySQL and Oracle you must specify username + password separate from DSN:
 					-->

test/testsuite/generator/behavior/AlternativeCodingStandardsBehaviorTest.php

@@ -19,7 +19,7 @@
  * @version    $Revision$
  * @package    generator.behavior
  */
-class AlternativeCodingStandardsBehaviorTest extends PHPUnit_Framework_TestCase
+class AlternativeCodingStandardsBehaviorTest extends \PHPUnit\Framework\TestCase
 {
     public function convertBracketsNewlineDataProvider()
     {

test/testsuite/generator/behavior/DelegateBehaviorTest.php

@@ -20,10 +20,10 @@
  * @version    $Revision$
  * @package    generator.behavior
  */
-class DelegateBehaviorTest extends PHPUnit_Framework_TestCase
+class DelegateBehaviorTest extends \PHPUnit\Framework\TestCase
 {
 
-    public function setUp()
+    protected function setUp(): void
     {
         if (!class_exists('DelegateDelegate')) {
             $schema = <<<EOF
@@ -175,6 +175,7 @@ public function testAModelCanHaveSeveralDelegates()
      */
     public function testAModelCannotHaveCascadingDelegates()
     {
+        $this->expectException(PropelException::class);
         $main = new DelegateMain();
         $main->setSummary('bar');
         $main->setBody('baz');

test/testsuite/generator/behavior/NamespacedBehaviorTest.php

@@ -1,7 +1,7 @@
 <?php
 require_once __DIR__.'/../../../fixtures/generator/behavior/Foobar.php';
 
-class NamespacedBehaviorTest extends PHPUnit_Framework_TestCase
+class NamespacedBehaviorTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * test if issue 425 is resolved

test/testsuite/generator/behavior/SoftDeleteBehaviorTest.php

@@ -21,7 +21,7 @@
 class SoftDeleteBehaviorTest extends BookstoreTestBase
 {
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         Table4Peer::disableSoftDelete();

test/testsuite/generator/behavior/TableBehaviorTest.php

@@ -14,9 +14,9 @@
  * @author     Francois Zaninotto
  * @package    generator.behavior
  */
-class TableBehaviorTest extends PHPUnit_Framework_TestCase
+class TableBehaviorTest extends \PHPUnit\Framework\TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         set_include_path(get_include_path() . PATH_SEPARATOR . "fixtures/bookstore/build/classes");