Merge pull request #1557 from spryker/bugfix/php-74-fixes

Small fixes for PHP 7.4

Author: PhilinTv

src/Propel/Generator/Builder/Om/QueryBuilder.php

@@ -533,10 +533,10 @@ protected function addFindPk(&$script)
             foreach ($pks as $col) {
                 $colNames[]= '$' . $col->getName();
             }
-            $pkType = 'array['. join($colNames, ', ') . ']';
+            $pkType = 'array['. join(', ', $colNames) . ']';
             $script .= "
      * <code>
-     * \$obj = \$c->findPk(array(" . join($examplePk, ', ') . "), \$con);";
+     * \$obj = \$c->findPk(array(" . join(', ', $examplePk) . "), \$con);";
         } else {
             $pkType = 'mixed';
             $script .= "

src/Propel/Generator/Builder/Util/SchemaReader.php

@@ -187,7 +187,7 @@ public function startElement($parser, $name, $attributes)
                         $this->isForReferenceOnly = (null !== $isForRefOnly ? ('true' === strtolower($isForRefOnly)) : true); // defaults to TRUE
                     }
 
-                    if ('/' !== $xmlFile{0}) {
+                    if ('/' !== $xmlFile[0]) {
                         $xmlFile = realpath(dirname($this->currentXmlFile) . DIRECTORY_SEPARATOR . $xmlFile);
                         if (!file_exists($xmlFile)) {
                             throw new SchemaException(sprintf('Unknown include external "%s"', $xmlFile));
@@ -202,12 +202,12 @@ public function startElement($parser, $name, $attributes)
                     break;
 
                 case 'table':
-                    if (!isset($attributes['schema']) 
+                    if (!isset($attributes['schema'])
                         && $this->currDB->getSchema() && $this->currDB->getPlatform()->supportsSchemas()
                         && false === strpos($attributes['name'], $this->currDB->getPlatform()->getSchemaDelimiter())) {
                         $attributes['schema'] = $this->currDB->getSchema();
                     }
-                    
+
                     $this->currTable = $this->currDB->addTable($attributes);
                     if ($this->isExternalSchema()) {
                         $this->currTable->setForReferenceOnly($this->isForReferenceOnly);

src/Propel/Runtime/ActiveQuery/Criteria.php

@@ -2408,10 +2408,10 @@ public function doUpdate($updateValues, ConnectionInterface $con)
                                 $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 . ', ';