Tests for SQL errors after updating to propel1.6

.travis.yml

@@ -1,36 +1,10 @@
 language: php
-dist: trusty
 
 branches:
   only:
-    - 1.6
-    - master
-    - gh-pages
+    - php7.4
 
-php:
-  - 5.4
-  - 5.5
-  - hhvm
+services: docker
 
-env:
-  - DB=mysql DB_USER=root
-
-before_script:
-  # MySQL
-  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -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;'; fi"
-  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE test; CREATE SCHEMA bookstore_schemas; CREATE SCHEMA contest; CREATE SCHEMA second_hand_books; CREATE DATABASE reverse_bookstore;'; fi"
-
-  # Composer
-  - wget http://getcomposer.org/composer.phar
-  - php composer.phar install --prefer-source
-
-  - ./test/reset_tests.sh
-
-script: vendor/bin/phpunit
-
-matrix:
-  include:
-    - php: 5.3
-      dist: precise
-  allow_failures:
-    - php: hhvm
+script:
+  bash docker/run.sh

composer.json

@@ -1,5 +1,5 @@
 {
-  "name": "propel/propel1",
+  "name": "jooola/propel1",
   "description": "Propel is an open-source Object-Relational Mapping (ORM) for PHP5.",
   "keywords": ["orm", "active record", "mapping", "database", "persistence"],
   "homepage": "http://www.propelorm.org/",
@@ -14,12 +14,15 @@
   },
   "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"
+    "pear-pear.php.net/pear_packagefilemanager2": "@stable",
+    "phpunit/phpunit": "^9.0.0",
+    "phpcompatibility/php-compatibility": "^9.3",
+    "squizlabs/php_codesniffer": "^3.5"
   },
   "extra": {
     "branch-alias": {
@@ -32,5 +35,9 @@
       "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();";
         }
 
@@ -3284,7 +3287,7 @@ public function isPrimaryKeyNull()
             }
             $script .= "
 
-        return " . join(' && ', $tests) . ";";
+        return " . implode(' && ', $tests) . ";";
         }
         $script .= "
     }

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/builder/om/PHP5PeerBuilder.php

@@ -1200,7 +1200,7 @@ public static function getPrimaryKeyFromRow(\$row, \$startcol = 0)
         if ($table->hasCompositePrimaryKey()) {
             $script .= "
 
-        return array(" . implode($pks, ', ') . ");";
+        return array(" . implode(', ', $pks) . ");";
         } else {
             $script .= "
 

generator/lib/builder/om/QueryBuilder.php

@@ -415,10 +415,10 @@ protected function addFindPk(&$script)
             }
             $pkType = 'array';
             $pkDescription = "
-                         A Primary key composition: " . '[' . join($colNames, ', ') . ']';
+                         A Primary key composition: " . '[' . implode(', ', $colNames) . ']';
             $script .= "
      * <code>
-     * \$obj = \$c->findPk(array(" . join($examplePk, ', ') . "), \$con);";
+     * \$obj = \$c->findPk(array(" . implode(', ', $examplePk) . "), \$con);";
         } else {
             $pkType = 'mixed';
             $script .= "

generator/lib/config/GeneratorConfig.php

@@ -121,7 +121,7 @@ public function getClassname($propname)
         // Basically, we want to turn ?.?.?.sqliteDataSQLBuilder into ?.?.?.SqliteDataSQLBuilder
         $lastdotpos = strrpos($classpath, '.');
         if ($lastdotpos !== false) {
-            $classpath{$lastdotpos + 1} = strtoupper($classpath{$lastdotpos + 1});
+            $classpath[$lastdotpos + 1] = strtoupper($classpath[$lastdotpos + 1]);
         } else {
             // Allows to configure full classname instead of a dot-path notation
             if (class_exists($classpath)) {

generator/lib/config/QuickGeneratorConfig.php

@@ -62,7 +62,7 @@ protected function parsePseudoIniFile($filepath)
         }
         foreach ($lines as $line) {
             $line = trim($line);
-            if ($line == "" || $line{0} == '#' || $line{0} == ';') {
+            if ($line == "" || $line[0] == '#' || $line[0] == ';') {
                 continue;
             }
             $pos = strpos($line, '=');

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/model/XMLElement.php

@@ -8,7 +8,6 @@
  * @license    MIT License
  */
 
-require_once dirname(__FILE__) . '/VendorInfo.php';
 
 /**
  * An abstract class for elements represented by XML tags (e.g. Column, Table).
@@ -109,7 +108,7 @@ protected function getDefaultValueForArray($stringValue)
             $values[] = trim($v);
         }
 
-        $value = implode($values, ' | ');
+        $value = implode(' | ', $values);
         if (empty($value) || ' | ' === $value) {
             return null;
         }
@@ -139,6 +138,7 @@ public function addVendorInfo($data)
 
             return $vi;
         } else {
+		require_once dirname(__FILE__) . '/VendorInfo.php';
             $vi = new VendorInfo();
             $vi->loadFromXML($data);
 
@@ -157,6 +157,7 @@ public function getVendorInfoForType($type)
             return $this->vendorInfos[$type];
         } else {
             // return an empty object
+		require_once dirname(__FILE__) . '/VendorInfo.php';
             return new VendorInfo($type);
         }
     }

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;
         }

generator/lib/platform/MysqlPlatform.php

@@ -732,9 +732,8 @@ public function hasSize($sqlType)
      */
     public function disconnectedEscapeText($text)
     {
-        // mysql_escape_string doesn't work in PHP >= 5.4
-        if (version_compare(PHP_VERSION, '5.4', '<') && function_exists('mysql_escape_string')) {
-            return mysql_escape_string($text);
+        if (function_exists('mysql_real_escape_string')) {
+            return mysql_real_escape_string($text);
         } else {
             return addslashes($text);
         }

generator/lib/platform/PgsqlPlatform.php

@@ -393,7 +393,7 @@ public function getModifyColumnDDL(PropelColumnDiff $columnDiff)
         foreach ($changedProperties as $key => $property) {
             switch ($key) {
                 case 'defaultValueType':
-                    continue;
+                    continue 2;
                 case 'size':
                 case 'type':
                 case 'scale':

generator/lib/task/AbstractPropelDataModelTask.php

@@ -516,7 +516,7 @@ protected function loadDataModels()
             foreach ($this->dataModels as $dataModel) {
                 $validator = new PropelSchemaValidator($dataModel);
                 if (!$validator->validate()) {
-                    throw new EngineException(sprintf("The database schema contains errors:\n - %s", join("\n - ", $validator->getErrors())));
+                    throw new EngineException(sprintf("The database schema contains errors:\n - %s", implode("\n - ", $validator->getErrors())));
                 }
             }
         }

phpunit.xml.dist

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

runtime/lib/Propel.php

@@ -731,7 +731,12 @@ private static function processDriverOptions($source, &$write_to)
             }
             $key = constant($key);
 
-            $value = $optiondata['value'];
+            if (is_array($optiondata && isset($optiondata['value']))) {
+                $value = $optiondata['value'];
+            } else {
+                $value = $optiondata;
+            }
+
             if (is_string($value) && strpos($value, '::') !== false) {
                 if (!defined($value)) {
                     throw new PropelException("Invalid PDO option/attribute value specified: " . $value);

runtime/lib/adapter/MSSQL/MssqlPropelPDO.php

@@ -23,7 +23,7 @@ class MssqlPropelPDO extends PropelPDO
      *
      * @return integer
      */
-    public function beginTransaction()
+    public function beginTransaction(): bool
     {
         $return = true;
         $opcount = $this->getNestedTransactionCount();
@@ -49,7 +49,7 @@ public function beginTransaction()
      *
      * @throws PropelException
      */
-    public function commit()
+    public function commit(): bool
     {
         $return = true;
         $opcount = $this->getNestedTransactionCount();
@@ -78,7 +78,7 @@ public function commit()
      *
      * @return integer
      */
-    public function rollBack()
+    public function rollBack(): bool
     {
         $return = true;
         $opcount = $this->getNestedTransactionCount();
@@ -132,7 +132,7 @@ public function forceRollBack()
      *
      * @return integer
      */
-    public function lastInsertId($seqname = null)
+    public function lastInsertId($seqname = null): string|false
     {
         $result = self::query('SELECT SCOPE_IDENTITY()');
 

runtime/lib/collection/PropelArrayCollection.php

@@ -163,7 +163,7 @@ public function toArray($keyColumn = null, $usePrefix = false, $keyType = BasePe
      *
      * @return array
      */
-    public function getArrayCopy($keyColumn = null, $usePrefix = false)
+    public function getArrayCopy($keyColumn = null, $usePrefix = false): array
     {
         if (null === $keyColumn && false === $usePrefix) {
             return parent::getArrayCopy();

runtime/lib/collection/PropelCollection.php

@@ -365,7 +365,7 @@ public function diff(PropelCollection $collection)
     /**
      * @return string
      */
-    public function serialize()
+    public function serialize(): string
     {
         $repr = array(
             'data'   => $this->getArrayCopy(),
@@ -380,7 +380,7 @@ public function serialize()
      *
      * @return void
      */
-    public function unserialize($data)
+    public function unserialize($data): void
     {
         $repr = unserialize($data);
         $this->exchangeArray($repr['data']);
@@ -395,7 +395,7 @@ public function unserialize($data)
      *
      * @return ArrayIterator
      */
-    public function getIterator()
+    public function getIterator(): ArrayIterator
     {
         $this->iterator = new ArrayIterator($this);
 
@@ -580,7 +580,7 @@ public function __call($name, $params)
      *
      * @return string
      */
-    public function __toString()
+    public function __toString(): string
     {
         return (string) $this->exportTo(constant($this->getPeerClass() . '::DEFAULT_STRING_FORMAT'));
     }

runtime/lib/collection/PropelObjectCollection.php

@@ -138,7 +138,7 @@ public function fromArray($arr)
      *
      * @return array
      */
-    public function getArrayCopy($keyColumn = null, $usePrefix = false)
+    public function getArrayCopy($keyColumn = null, $usePrefix = false): array
     {
         if (null === $keyColumn && false === $usePrefix) {
             return parent::getArrayCopy();