Merge pull request #70 from indygriffiths/php7.2

Remove reference to Object with SS_Object
This commit is contained in:
Damian Mooyman 2019-10-16 12:58:36 +13:00 committed by GitHub
commit 8ea5c26198
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 11 deletions

View File

@ -4,19 +4,18 @@ language: php
sudo: false sudo: false
php:
- 5.5
env: env:
matrix: matrix:
- DB=MYSQL CORE_RELEASE=3.4 - DB=MYSQL CORE_RELEASE=3.7
matrix: matrix:
include: include:
- php: 5.3 - php: 7.1
env: DB=MYSQL CORE_RELEASE=3.3 env: DB=MYSQL CORE_RELEASE=3.7
- php: 5.5 - php: 7.2
env: DB=MYSQL CORE_RELEASE=3 env: DB=MYSQL CORE_RELEASE=3.7
- php: 7.3
env: DB=MYSQL CORE_RELEASE=3.7
before_script: before_script:
- phpenv rehash - phpenv rehash
@ -25,4 +24,4 @@ before_script:
- cd ~/builds/ss - cd ~/builds/ss
script: script:
- phpunit testsession/tests/unit/ - vendor/bin/phpunit testsession/tests/unit/

View File

@ -25,3 +25,7 @@ if(class_exists('Resque_Event') && class_exists('SSResqueRun')) {
} }
}); });
} }
if (!class_exists('SS_Object')) {
class_alias('Object', 'SS_Object');
}

View File

@ -24,7 +24,7 @@
* *
* See {@link $state} for default information stored in the test session. * See {@link $state} for default information stored in the test session.
*/ */
class TestSessionEnvironment extends Object class TestSessionEnvironment extends SS_Object
{ {
/** /**

View File

@ -13,7 +13,7 @@
], ],
"require": { "require": {
"composer/installers": "*", "composer/installers": "*",
"silverstripe/framework": "^3.2" "silverstripe/framework": "^3.7"
}, },
"minimum-stability": "dev" "minimum-stability": "dev"
} }