Merge pull request #83 from creative-commoners/pulls/master/restore-p…

…hp-5.6-support BUG Restoring PHP5.6 support
silverstripe · Oct 18, 2019 · 444d1aa · 444d1aa
2 parents b3acde8 + ac0b263
commit 444d1aa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,8 @@ env:
 
 matrix:
   include:
+    - php: 5.6
+      env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_TEST=1
     - php: 7.1
       env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
     - php: 7.1
@@ -17,7 +19,7 @@ matrix:
     - php: 7.2
       env: DB=MYSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_TEST=1
     - php: 7.3
-      env: DB=MYSQL RECIPE_VERSION=4.x-dev
+      env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1
 
 before_script:
   # Init PHP

diff --git a/src/RestfulServer.php b/src/RestfulServer.php
@@ -905,11 +905,11 @@ protected function getMember()
      * @param HTTPRequest $request
      * @return string
      */
-    protected function resolveClassName(HTTPRequest $request): string
+    protected function resolveClassName(HTTPRequest $request)
     {
         $className = $request->param('ClassName');
         $aliases = self::config()->get('endpoint_aliases');
 
-        return $aliases[$className] ?? $this->unsanitiseClassName($className);
+        return empty($aliases[$className]) ? $this->unsanitiseClassName($className) : $aliases[$className];
     }
 }