Remove dependency with Symfony main package (#163)

jordisala1991 · dbu · commit 0c0c2e33b625 · 2018-01-02T08:00:27.000+01:00
Replace symfony/symfony by concrete bundles/components

it is a really bad idea to require the full symfony package, it is
better to just rely on the packages that you require directly.
diff --git a/composer.json b/composer.json
@@ -9,18 +9,31 @@
         }
     ],
     "require": {
-        "php": "^5.6|^7.0",
-        "symfony/symfony": "^2.8|^3.0",
-        "symfony/phpunit-bridge": "^3.2",
-        "symfony/monolog-bundle": "^2.1|^3.0",
+        "php": "^5.6 || ^7.0",
         "doctrine/common": "^2.4",
+        "doctrine/data-fixtures": "^1.0",
         "doctrine/doctrine-bundle": "^1.0",
-        "doctrine/phpcr-odm": "^1.1|^2.0",
         "doctrine/phpcr-bundle": "^1.1",
-        "doctrine/data-fixtures": "^1.0",
+        "doctrine/phpcr-odm": "^1.1 || ^2.0",
+        "friendsofsymfony/jsrouting-bundle": "^1.1",
         "jackalope/jackalope": "^1.1.5",
         "jackalope/jackalope-doctrine-dbal": "^1.1.5",
-        "friendsofsymfony/jsrouting-bundle": "^1.1"
+        "symfony/browser-kit": "^2.8 || ^3.0",
+        "symfony/console": "^2.8 || ^3.0",
+        "symfony/css-selector": "^2.8 || ^3.0",
+        "symfony/debug": "^2.8 || ^3.0",
+        "symfony/dependency-injection": "^2.8 || ^3.0",
+        "symfony/doctrine-bridge": "^2.8 || ^3.0",
+        "symfony/framework-bundle": "^2.8.1 || ^3.0",
+        "symfony/http-foundation": "^2.8 || ^3.0",
+        "symfony/http-kernel": "^2.8 || ^3.0",
+        "symfony/monolog-bundle": "^2.8 || ^3.0",
+        "symfony/process": "^2.8 || ^3.0",
+        "symfony/security-bundle": "^2.8 || ^3.0",
+        "symfony/twig-bundle": "^2.8 || ^3.0"
+    },
+    "require-dev": {
+        "symfony/phpunit-bridge": "^4.0"
     },
     "autoload": {
         "psr-4": {
@@ -32,6 +45,9 @@
             "Symfony\\Cmf\\Component\\Testing\\Tests\\": "tests/"
         }
     },
+    "config": {
+        "sort-packages": true
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "2.0-dev"
diff --git a/src/Functional/DbManager/PHPCR.php b/src/Functional/DbManager/PHPCR.php
@@ -23,6 +23,7 @@
 class PHPCR
 {
     protected $container;
+
     protected $om;
 
     /**
diff --git a/src/HttpKernel/TestKernel.php b/src/HttpKernel/TestKernel.php
@@ -39,6 +39,7 @@
 abstract class TestKernel extends Kernel
 {
     protected $bundleSets = array();
+
     protected $requiredBundles = array();
 
     /**
diff --git a/src/Phpunit/DatabaseTestListener.php b/src/Phpunit/DatabaseTestListener.php
@@ -18,7 +18,9 @@
 class DatabaseTestListener implements \PHPUnit_Framework_TestListener
 {
     protected static $currentSuite;
+
     private $processBuilder;
+
     private $prefix = array();
 
     public function __construct($processBuilder = null)
diff --git a/src/Unit/Constraint/SchemaAcceptsXml.php b/src/Unit/Constraint/SchemaAcceptsXml.php
@@ -14,7 +14,9 @@
 class SchemaAcceptsXml extends \PHPUnit_Framework_Constraint
 {
     protected $xml;
+
     protected $failingElement;
+
     protected $errors;
 
     public function __construct($xml)
diff --git a/tests/Functional/BaseTestCaseTest.php b/tests/Functional/BaseTestCaseTest.php
@@ -16,8 +16,11 @@
 class BaseTestCaseTest extends \PHPUnit_Framework_TestCase
 {
     private $container;
+
     private $kernel;
+
     private $testCase;
+
     private $client;
 
     protected function setUp()
diff --git a/tests/HttpKernel/TestKernelTest.php b/tests/HttpKernel/TestKernelTest.php
@@ -20,6 +20,7 @@
 class TestKernelTest extends \PHPUnit_Framework_TestCase
 {
     private $kernel;
+
     private $mockBundle;
 
     protected function setUp()
diff --git a/tests/Phpunit/DatabaseTestListenerTest.php b/tests/Phpunit/DatabaseTestListenerTest.php
@@ -16,7 +16,9 @@
 class DatabaseTestListenerTest extends \PHPUnit_Framework_TestCase
 {
     protected $listener;
+
     private $processBuilder;
+
     private static $i;
 
     protected function setUp()

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`class PHPCR`
`24`	`24`	`{`
`25`	`25`	`protected $container;`
	`26`	`+`
`26`	`27`	`protected $om;`
`27`	`28`
`28`	`29`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@`
`39`	`39`	`abstract class TestKernel extends Kernel`
`40`	`40`	`{`
`41`	`41`	`protected $bundleSets = array();`
	`42`	`+`
`42`	`43`	`protected $requiredBundles = array();`
`43`	`44`
`44`	`45`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,9 @@`
`18`	`18`	`class DatabaseTestListener implements \PHPUnit_Framework_TestListener`
`19`	`19`	`{`
`20`	`20`	`protected static $currentSuite;`
	`21`	`+`
`21`	`22`	`private $processBuilder;`
	`23`	`+`
`22`	`24`	`private $prefix = array();`
`23`	`25`
`24`	`26`	`public function __construct($processBuilder = null)`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,9 @@`
`14`	`14`	`class SchemaAcceptsXml extends \PHPUnit_Framework_Constraint`
`15`	`15`	`{`
`16`	`16`	`protected $xml;`
	`17`	`+`
`17`	`18`	`protected $failingElement;`
	`19`	`+`
`18`	`20`	`protected $errors;`
`19`	`21`
`20`	`22`	`public function __construct($xml)`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`class TestKernelTest extends \PHPUnit_Framework_TestCase`
`21`	`21`	`{`
`22`	`22`	`private $kernel;`
	`23`	`+`
`23`	`24`	`private $mockBundle;`
`24`	`25`
`25`	`26`	`protected function setUp()`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,9 @@`
`16`	`16`	`class DatabaseTestListenerTest extends \PHPUnit_Framework_TestCase`
`17`	`17`	`{`
`18`	`18`	`protected $listener;`
	`19`	`+`
`19`	`20`	`private $processBuilder;`
	`21`	`+`
`20`	`22`	`private static $i;`
`21`	`23`
`22`	`24`	`protected function setUp()`