tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7281 from sminnee/test-php72

Browse Source 
NEW: Test on php 7.2
This commit is contained in:
Daniel Hensby 2017-08-18 21:22:10 +01:00 committed by GitHub
commit 304889ff2f
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -36,6 +36,11 @@ matrix:
- DB=MYSQL
- PDO=1
- PHPUNIT_COVERAGE_TEST=framework
- php: 7.2
env:
- DB=MYSQL
- PDO=1
- PHPUNIT_TEST=framework
- php: 7.0
env:
- DB=MYSQL
@ -54,7 +59,7 @@ before_script:
- export CORE_RELEASE=$TRAVIS_BRANCH
- printf "\n" | pecl install imagick
- phpenv rehash
- phpenv config-rm xdebug.ini
- phpenv config-rm xdebug.ini || true
- echo 'memory_limit = 2048M' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
# Temporarily update to 1.5.x-dev of composer

4
src/ORM/DataObject.php
View File

@ -807,8 +807,8 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
if ($relObj->$relation() instanceof DataObject) {
$parentObj = $relObj;
$relObj = $relObj->$relation();
// If the intermediate relationship objects have been created, then write them
if ($i<sizeof($relation)-1 && !$relObj->ID || (!$relObj->ID && $parentObj !== $this)) {
// If the intermediate relationship objects haven't been created, then write them
if ($i<sizeof($relations)-1 && !$relObj->ID || (!$relObj->ID && $parentObj !== $this)) {
$relObj->write();
$relatedFieldName = $relation."ID";
$parentObj->$relatedFieldName = $relObj->ID;

14
thirdparty/difflib/difflib.php vendored
View File

@ -418,7 +418,7 @@ class DiffEngine
$i = 0;
$j = 0;
assert('sizeof($lines) == sizeof($changed)');
assert(sizeof($lines) == sizeof($changed));
$len = sizeof($lines);
$other_len = sizeof($other_changed);
@ -438,7 +438,7 @@ class DiffEngine
$j++;
while ($i < $len && !$changed[$i]) {
assert('$j < $other_len && ! $other_changed[$j]');
assert($j < $other_len && ! $other_changed[$j]);
$i++;
$j++;
while ($j < $other_len && $other_changed[$j])
@ -471,10 +471,10 @@ class DiffEngine
$changed[--$i] = false;
while ($start > 0 && $changed[$start - 1])
$start--;
assert('$j > 0');
assert($j > 0);
while ($other_changed[--$j])
continue;
assert('$j >= 0 && !$other_changed[$j]');
assert($j >= 0 && !$other_changed[$j]);
}
/*
@ -497,7 +497,7 @@ class DiffEngine
while ($i < $len && $changed[$i])
$i++;
assert('$j < $other_len && ! $other_changed[$j]');
assert($j < $other_len && ! $other_changed[$j]);
$j++;
if ($j < $other_len && $other_changed[$j]) {
$corresponding = $i;
@ -514,10 +514,10 @@ class DiffEngine
while ($corresponding < $i) {
$changed[--$start] = 1;
$changed[--$i] = 0;
assert('$j > 0');
assert($j > 0);
while ($other_changed[--$j])
continue;
assert('$j >= 0 && !$other_changed[$j]');
assert($j >= 0 && !$other_changed[$j]);
}
}
}