From ae336b35ae6c1d25d40ba9c9be28b19e983bbafa Mon Sep 17 00:00:00 2001 From: robbt Date: Wed, 6 May 2020 17:33:27 -0400 Subject: [PATCH 1/2] Fixed deprecated curley bracket array access --- generator/lib/config/GeneratorConfig.php | 2 +- generator/lib/config/QuickGeneratorConfig.php | 2 +- runtime/lib/util/BasePeer.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/generator/lib/config/GeneratorConfig.php b/generator/lib/config/GeneratorConfig.php index b2602ed05..dd468842a 100644 --- a/generator/lib/config/GeneratorConfig.php +++ b/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)) { diff --git a/generator/lib/config/QuickGeneratorConfig.php b/generator/lib/config/QuickGeneratorConfig.php index 36405b286..4bc8efef3 100644 --- a/generator/lib/config/QuickGeneratorConfig.php +++ b/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, '='); diff --git a/runtime/lib/util/BasePeer.php b/runtime/lib/util/BasePeer.php index 8b71b88ee..156271f6e 100644 --- a/runtime/lib/util/BasePeer.php +++ b/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 . ', '; From 3951fe6d6d94f8eafec0140d7b7f2450872555b8 Mon Sep 17 00:00:00 2001 From: robbt Date: Thu, 7 May 2020 13:39:25 -0400 Subject: [PATCH 2/2] Force use of old composer --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9bbabbff5..ccb61e824 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ before_script: - 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 + - wget https://getcomposer.org/download/1.8.6/composer.phar - php composer.phar install --prefer-source - ./test/reset_tests.sh