Merge branch 'v2beta' of https://github.com/yourjhay/simple-php into …

…v2beta # Conflicts: # app/Helper/Twig/FunctionExtension.php
yourjhay · Oct 3, 2020 · d88cae9 · d88cae9
2 parents 5362d35 + c344eed
commit d88cae9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/app/Helper/Twig/FunctionExtension.php b/app/Helper/Twig/FunctionExtension.php
@@ -40,4 +40,5 @@ public function alias($var, $param=null)
     {
         return alias($var, $param);
     }
+
 }
diff --git a/composer.json b/composer.json
@@ -13,12 +13,18 @@
         }
     ],
     "require": {
-        "simplyphp/framework": "v2.0.0-beta",
+        "simplyphp/framework": "v2.0.1-beta",
         "php": ">=7.1"
     },
     "autoload": {
         "psr-4": {
             "App\\": "app/"
         }
-    }
+    }, 
+
+    "config": {
+        "sort-packages": true
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }