Master dev kit (#48)

* support symfony 3.4, new testing app folder structure

* Apply fixes from StyleCI (#49)

[ci skip] [skip ci]

Author: ElectricMaxxx

.gitignore

@@ -1,5 +1,4 @@
-Tests/Resources/app/cache
-Tests/Resources/app/logs
-Tests/Resources/data
+tests/Fixtures/App/var/
+!tests/Fixtures/App/var/.gitempty
 composer.lock
 vendor

.travis.yml

@@ -26,31 +26,30 @@ cache:
     - $HOME/.composer/cache/files
 
 env:
-  matrix: SYMFONY_VERSION=3.4
+  matrix: SYMFONY_VERSION=^3.4@dev
   global:
-    - SYMFONY_DEPRECATIONS_HELPER=48
+    - SYMFONY_DEPRECATIONS_HELPER=0
     - SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
+    - KERNEL_CLASS=Symfony\Cmf\Bundle\ResourceBundle\Tests\Fixtures\App\Kernel
     - SYMFONY_PHPUNIT_VERSION=5.7
     - TEST_INSTALLATION=false
 
 matrix:
   include:
     - php: 7.1
-      env: SYMFONY_VERSION=3.4.*
+      env: DEPS=dev SYMFONY_VERSION=^4@dev
     - php: 7.1
-      env: DEPS=dev SYMFONY_VERSION=3.3.*
-    - php: 7.0
-      env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
+      env: DEPS=dev SYMFONY_VERSION=^3.4@dev
     - php: 7.1
-      env: SYMFONY_VERSION=3.1.*
+      env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
     - php: 7.1
-      env: SYMFONY_VERSION=3.2.*
+      env: SYMFONY_VERSION=3.3.*
     - env: TEST_INSTALLATION=true
 
   fast_finish: true
   allow_failures:
     - php: 7.1
-      env: SYMFONY_VERSION=3.4.*
+      env: DEPS=dev SYMFONY_VERSION=^4@dev
     - env: TEST_INSTALLATION=true
 
 

CHANGELOG.md

@@ -1,7 +1,7 @@
 Changelog
 =========
 
-
+* **2017-11-16**: Removed php 5.6 and 7.0 support, removed Symfony 3.0.* and 3.1.* support
 * **2017-10-24**: Dropped hhvm support
 
 1.0.0

Makefile

@@ -20,7 +20,7 @@ ifdef BRANCH
 	VERSION=dev-${BRANCH}
 endif
 PACKAGE=symfony-cmf/resource-bundle
-
+export KERNEL_CLASS=Symfony\Cmf\Bundle\ResourceBundle\Tests\Fixtures\App\Kernel
 list:
 	@echo 'test:                    will run all tests'
 	@echo 'unit_tests:               will run unit tests only'

README.md

@@ -36,8 +36,8 @@ provide the context with which to resolve the documents.
 
 ## Requirements
 
-* PHP 7.0 / 7.1
-* Symfony 2.8 / 3.1 / 3.2 / 3.3
+* PHP 7.1
+* Symfony 2.8 / 3.3 / ^3.4@dev
 * See also the `require` section of [composer.json](composer.json)
 
 ## Documentation

composer.json

@@ -11,16 +11,17 @@
     ],
     "require": {
         "php": "^5.6|^7.0",
-        "symfony/framework-bundle": "^2.8|^3.0",
-        "symfony/options-resolver": "^2.8|^3.0",
-        "symfony-cmf/resource": "^1.0"
+        "symfony/framework-bundle": "^2.8|^3.3",
+        "symfony/options-resolver": "^2.8|^3.3",
+        "symfony-cmf/resource": "^1.0",
+        "symfony/symfony": "^3.4@dev"
     },
     "require-dev": {
         "symfony-cmf/testing": "^2.1@dev",
         "symfony/phpunit-bridge": "^3.2",
-        "doctrine/phpcr-odm": "^1.3"
+        "doctrine/phpcr-odm": "^1.4|^2.0"
     },
-    "minimum-stability": "stable",
+    "minimum-stability":"dev",
     "prefer-stable": true,
     "suggest": {
         "doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents (^1.3)",
@@ -30,7 +31,10 @@
         "psr-4": { "Symfony\\Cmf\\Bundle\\ResourceBundle\\": "src/" }
     },
     "autoload-dev": {
-        "psr-4": { "Symfony\\Cmf\\Bundle\\ResourceBundle\\Tests\\": "tests/" }
+        "psr-4": {
+            "Symfony\\Cmf\\Bundle\\ResourceBundle\\Tests\\": "tests/",
+            "Symfony\\Cmf\\Bundle\\ResourceBundle\\Tests\\App\\": "tests/Resources/app"
+        }
     },
     "extra": {
         "branch-alias": {

phpunit.xml.dist

@@ -24,9 +24,4 @@
             </exclude>
         </whitelist>
     </filter>
-
-    <php>
-        <server name="KERNEL_DIR" value="tests/Resources/app" />
-    </php>
-
 </phpunit>

src/DependencyInjection/CmfResourceExtension.php

@@ -84,6 +84,7 @@ private function loadRepositories(ContainerBuilder $container, array $configs, $
 
             $serviceId = self::getRepositoryServiceId($repositoryName);
             $definition = $factory->create($config);
+            $definition->setPublic(true);
             $typeMap[$definition->getClass()] = $type;
             $serviceMap[$repositoryName] = $serviceId;
 

src/Resources/config/resource.xml

@@ -7,7 +7,7 @@
 
         <service id="cmf_resource.finder.selector.parser" class="Symfony\Cmf\Component\Resource\Finder\SelectorParser" public="false" />
 
-        <service id="cmf_resource.registry" class="Symfony\Cmf\Bundle\ResourceBundle\Registry\RepositoryRegistry">
+        <service id="cmf_resource.registry" class="Symfony\Cmf\Bundle\ResourceBundle\Registry\RepositoryRegistry" public="true">
             <argument type="service" id="service_container"/>
             <argument /> <!-- service map -->
             <argument /> <!-- type map -->

tests/Resources/app/AppKernel.php renamed to tests/Fixtures/App/Kernel.php

@@ -9,10 +9,12 @@
  * file that was distributed with this source code.
  */
 
+namespace Symfony\Cmf\Bundle\ResourceBundle\Tests\Fixtures\App;
+
 use Symfony\Cmf\Component\Testing\HttpKernel\TestKernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
 
-class AppKernel extends TestKernel
+class Kernel extends TestKernel
 {
     public function configure()
     {