Skip to content

Fixed deprecated curley bracket array access for Php 7.4 compatibility #1082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Robbt wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed deprecated curley bracket array access for Php 7.4 compatibility #1082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae336b3
Fixed deprecated curley bracket array access
Robbt May 6, 2020
3951fe6
Force use of old composer
Robbt May 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion generator/lib/config/GeneratorConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion generator/lib/config/QuickGeneratorConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, '=');
Expand Down
4 changes: 2 additions & 2 deletions runtime/lib/util/BasePeer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 . ', ';
Expand Down