Merge pull request #72 from uvinum/devel

Multiple improvements from Uvinum's fork
sifophp · Apr 17, 2017 · b9276a4 · b9276a4
2 parents f0ec78a + 6adfb58
commit b9276a4
Show file tree

Hide file tree

Showing 576 changed files with 295 additions and 93,769 deletions.
diff --git a/composer.json b/composer.json
@@ -6,10 +6,12 @@
   "homepage": "https://github.com/sifophp/SIFO",
   "type": "project",
   "require": {
-    "php": ">=5.3.2",
+    "php": ">=5.6.7",
     "smarty/smarty": "dev-master#c8ecad0",
-    "tpyo/amazon-s3-php-class": "0.5.*",
-    "phpmailer/phpmailer": "5.2.*",
-    "symfony/yaml": "2.6.0"
+    "twig/twig": "~2.0",
+    "twig/extensions": "~1.4",
+    "tpyo/amazon-s3-php-class": "~0.5",
+    "phpmailer/phpmailer": "~5.2",
+    "symfony/yaml": "~3.0"
   }
 }
diff --git a/src/PHPUnit-3.5.0/Autoload.php b/src/PHPUnit-3.5.0/Autoload.php
diff --git a/src/PHPUnit-3.5.0/Extensions/ControllerTest.php b/src/PHPUnit-3.5.0/Extensions/ControllerTest.php
diff --git a/src/PHPUnit-3.5.0/Extensions/Database/AbstractTester.php b/src/PHPUnit-3.5.0/Extensions/Database/AbstractTester.php