some php 7.4 changes from propelorm#1086

DavidGoodwin · Sep 16, 2020 · 0f32375 · 0f32375
1 parent 37b98bd
commit 0f32375
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 11 deletions.
diff --git a/generator/lib/builder/om/PHP5PeerBuilder.php b/generator/lib/builder/om/PHP5PeerBuilder.php
@@ -1203,7 +1203,7 @@ public static function getPrimaryKeyFromRow(\$row, \$startcol = 0)
         if ($table->hasCompositePrimaryKey()) {
             $script .= "
 
-        return array(" . implode($pks, ', ') . ");";
+        return array(" . implode(', ', $pks) . ");";
         } else {
             $script .= "
 

diff --git a/generator/lib/builder/om/QueryBuilder.php b/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 .= "

diff --git a/generator/lib/model/XMLElement.php b/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;
         }

diff --git a/generator/lib/platform/PgsqlPlatform.php b/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':

diff --git a/runtime/lib/map/TableMap.php b/runtime/lib/map/TableMap.php
@@ -786,6 +786,9 @@ public function setPrefix($prefix)
      */
     protected function hasPrefix($data)
     {
+        if(!$this->prefix) {
+            return false;
+        }
         return (strpos($data, $this->prefix) === 0);
     }
 

diff --git a/runtime/lib/parser/PropelCSVParser.php b/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)

diff --git a/runtime/lib/validator/MatchValidator.php b/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 . '/';
         }