Update symphony to 2.8

ilios · Dec 17, 2015 · adb2819 · adb2819
1 parent 3ec7fae
commit adb2819
Show file tree

Hide file tree

Showing 5 changed files with 659 additions and 313 deletions.
diff --git a/bin/symfony_requirements b/bin/symfony_requirements
@@ -81,7 +81,7 @@ function get_error_message(Requirement $requirement, $lineSize)
         return;
     }
 
-    $errorMessage  = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.'   ').PHP_EOL;
+    $errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.'   ').PHP_EOL;
     $errorMessage .= '   > '.wordwrap($requirement->getHelpText(), $lineSize - 5, PHP_EOL.'   > ').PHP_EOL;
 
     return $errorMessage;
@@ -122,8 +122,8 @@ function echo_block($style, $title, $message)
     echo PHP_EOL.PHP_EOL;
 
     echo_style($style, str_repeat(' ', $width).PHP_EOL);
-    echo_style($style, str_pad(' ['.$title.']',  $width, ' ', STR_PAD_RIGHT).PHP_EOL);
-    echo_style($style, str_pad($message,  $width, ' ', STR_PAD_RIGHT).PHP_EOL);
+    echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL);
+    echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL);
     echo_style($style, str_repeat(' ', $width).PHP_EOL);
 }
 

diff --git a/composer.json b/composer.json
@@ -1,24 +1,24 @@
 {
     "name": "ilios/ilios",
-    "license": "GPL-3.0+",
+    "license": "MIT",
     "type": "project",
     "description": "The \"Ilios Standard Edition\" distribution",
     "autoload": {
         "psr-0": { "": "src/" }
     },
     "require": {
         "php": "~5.4,>=5.4.4",
-        "symfony/symfony": "2.7.*",
+        "symfony/symfony": "2.8.*",
         "doctrine/orm": "2.5.*",
         "doctrine/doctrine-bundle": "1.6.*",
         "twig/extensions": "1.3.*",
         "symfony/swiftmailer-bundle": "~2.3",
         "symfony/monolog-bundle": "~2.8",
-        "sensio/distribution-bundle": "~3.0",
+        "sensio/distribution-bundle": "~4.0",
         "sensio/framework-extra-bundle": "~3.0",
         "incenteev/composer-parameter-handler": "~2.0",
         "jms/serializer-bundle": "^1.0",
-        "nelmio/api-doc-bundle": "~2.10",
+        "nelmio/api-doc-bundle": "~2.11",
         "nelmio/cors-bundle": "~1.4",
         "jms/di-extra-bundle": "~1.5",
         "firebase/php-jwt": "^3.0",
@@ -28,7 +28,7 @@
         "doctrine/doctrine-fixtures-bundle": "~2.3",
         "friendsofsymfony/rest-bundle": "~1.7",
         "tdn/php-types": "1.*",
-        "matthiasnoback/symfony-console-form": "^1.1",
+        "matthiasnoback/symfony-console-form": "^1.2",
         "dreamscapes/ldap-core": "^3.1",
         "eluceo/ical": "^0.9.0",
         "exercise/htmlpurifier-bundle": "@stable"
@@ -41,17 +41,10 @@
         "matthiasnoback/symfony-dependency-injection-test": "@stable",
         "matthiasnoback/symfony-config-test": "@stable",
         "instaclick/base-test-bundle": "^0.5",
-        "mockery/mockery": "^0.9.3",
+        "mockery/mockery": "^0.9.4",
         "fzaninotto/faker": "^1.5",
-        "liip/functional-test-bundle": "~1.2",
-        "satooshi/php-coveralls": "^0.6"
+        "liip/functional-test-bundle": "~1.3"
     },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/markuspoerschke/iCal"
-        }
-    ],
     "scripts": {
         "post-root-package-install": [
             "SymfonyStandard\\Composer::hookRootPackageInstall"