Merge pull request #41 from creative-commoners/pulls/4.0/php53-support

FIX Use a symfony/yaml that is compatible with PHP 5.3.3
silverstripe · Jun 28, 2017 · 3244720 · 3244720
2 parents 333e928 + f836d6c
commit 3244720
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 22 deletions.
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
     ],
     "require": {
         "apigen/apigen": "2.8.x-dev",
-        "symfony/yaml": "^3.3"
+        "symfony/yaml": "~2.6.0"
     },
     "repositories": [
         {

diff --git a/composer.lock b/composer.lock
diff --git a/htdocs/search/lookup.php b/htdocs/search/lookup.php
@@ -5,9 +5,6 @@
 
 require_once __DIR__ . '/../../vendor/autoload.php';
 
-// 2017-06-27: Cannot run composer dump-autoload on SSP
-require_once __DIR__ . '/../../src/Lookup.php';
-
 $lookup = new SilverStripe\ApiDocs\Lookup($_GET);
 
 $lookup->setVersionMap(array(

diff --git a/src/Lookup.php b/src/Lookup.php
@@ -182,7 +182,7 @@ public function getUpgraderMap()
         foreach (glob($mapFilePaths) as $mapFile) {
             try {
                 $mapping = (array) Yaml::parse(file_get_contents($mapFile));
-            } catch (\Symfony\Component\Yaml\ParseException $ex) {
+            } catch (\Symfony\Component\Yaml\Exception\ParseException $ex) {
                 // Fail gracefully here
             }
             if (!empty($mapping['mappings'])) {