3.7 PHP 7.2 support

unclecheese · Sep 5, 2018 · ca910ac · ca910ac
1 parent ede693a
commit ca910ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/_config.php b/_config.php
@@ -1,7 +1,3 @@
 <?php
 
 define('DISPLAY_LOGIC_DIR', basename(dirname(__FILE__)));
-
-// Ensure compatibility with PHP 7.2 ("object" is a reserved word),
-// with SilverStripe 3.6 (using Object) and SilverStripe 3.7 (using SS_Object)
-if (!class_exists('SS_Object')) class_alias('Object', 'SS_Object');
diff --git a/composer.json b/composer.json
@@ -15,10 +15,9 @@
     ],
     "require":
     {
-        "silverstripe/framework": "3.1.*"
+        "silverstripe/framework": "~3.7"
     },
     "extra": {
-	"installer-name": "display_logic"
-    }
-
+		"installer-name": "display_logic"
+    }    
 }