Merge pull request #1 from tworzenieweb/php7.4

Php7.4

.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

@@ -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();";
         }
 

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: " . '[' . join(', ', $colNames) . ']';
             $script .= "
      * <code>
-     * \$obj = \$c->findPk(array(" . join($examplePk, ', ') . "), \$con);";
+     * \$obj = \$c->findPk(array(" . join(', ', $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

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

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/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':

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,18 +32,29 @@ 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.');
         }
+
+        $data = [];
+
         while ($row = $stmt->fetch(PDO::FETCH_NUM)) {
-            if ($object = &$this->getStructuredArrayFromRow($row)) {
-                $collection[] = $object;
+            $object = &$this->getStructuredArrayFromRow($row);
+            if ($object) {
+                $data[] = &$object;
             }
         }
         $this->currentObjects = array();
         $this->alreadyHydratedObjects = array();
         $stmt->closeCursor();
 
+        $collection->setData($data);
+
         return $collection;
     }
 
@@ -163,7 +174,7 @@ public function &getStructuredArrayFromRow($row)
             return $this->alreadyHydratedObjects[$this->class][$mainKey];
         } else {
             // we still need to return a reference to something to avoid a warning
-            return $emptyVariable;
+            return $this->emptyVariable;
         }
     }
 }

runtime/lib/map/TableMap.php

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

runtime/lib/parser/PropelCSVParser.php

@@ -45,19 +45,19 @@ public function fromArray($array, $isList = false, $includeHeading = true)
         $rows = array();
         if ($isList) {
             if ($includeHeading) {
-                $rows[] = implode($this->formatRow(array_keys(reset($array))), $this->delimiter);
+                $rows[] = implode($this->delimiter, $this->formatRow(array_keys(reset($array))));
             }
             foreach ($array as $row) {
-                $rows[] = implode($this->formatRow($row), $this->delimiter);
+                $rows[] = implode($this->delimiter, $this->formatRow($row));
             }
         } else {
             if ($includeHeading) {
-                $rows[] = implode($this->formatRow(array_keys($array)), $this->delimiter);
+                $rows[] = implode($this->delimiter, $this->formatRow(array_keys($array)));
             }
-            $rows[] = implode($this->formatRow($array), $this->delimiter);
+            $rows[] = implode($this->delimiter, $this->formatRow($array));
         }
 
-        return implode($rows, $this->lineTerminator) . $this->lineTerminator;
+        return implode($this->lineTerminator, $rows) . $this->lineTerminator;
     }
 
     public function listFromArray($array)

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 '[':
@@ -127,7 +125,7 @@ protected static function dumpArray($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))
+      (count($keys) > 1 && array_reduce($keys, function($v, $w) { return (integer) $v + $w; }, 0) == count($keys) * (count($keys) - 1) / 2))
     {
       $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/query/Join.php

@@ -537,7 +537,7 @@ public function getClause(&$params)
             for ($i = 0; $i < $this->count; $i++) {
                 $conditions [] = $this->getLeftColumn($i) . $this->getOperator($i) . $this->getRightColumn($i);
             }
-            $joinCondition = sprintf('(%s)', implode($conditions, ' AND '));
+            $joinCondition = sprintf('(%s)', implode(' AND ', $conditions));
         } else {
             $joinCondition = '';
             $this->getJoinCondition()->appendPsTo($joinCondition, $params);

runtime/lib/query/ModelCriteria.php

@@ -525,7 +525,7 @@ public function offset($offset)
      */
     public function select($columnArray)
     {
-        if (!count($columnArray) || $columnArray == '') {
+        if (empty($columnArray)) {
             throw new PropelException('You must ask for at least one column');
         }
 

runtime/lib/util/BasePeer.php

@@ -397,10 +397,10 @@ public static function doUpdate(Criteria $selectCriteria, Criteria $updateValues
                                 $rawcvt = '';
                                 // parse the $params['raw'] for ? chars
                                 for ($r = 0, $len = strlen($raw); $r < $len; $r++) {
-                                    if ($raw{$r} == '?') {
+                                    if ($raw[$r] == '?') {
                                         $rawcvt .= ':p' . $p++;
                                     } else {
-                                        $rawcvt .= $raw{$r};
+                                        $rawcvt .= $raw[$r];
                                     }
                                 }
                                 $sql .= $rawcvt . ', ';

runtime/lib/validator/MatchValidator.php

@@ -50,7 +50,7 @@ class MatchValidator 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 . '/';
         }
 

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