feature #5 Update for SF 4 compat (ogizanagi)

ogizanagi · ogizanagi · commit 03c1a3dbb624 · 2018-04-03T14:10:38.000+02:00
This PR was merged into the 1.0.x-dev branch. Discussion ---------- Update for SF 4 compat Commits ------- 6909d0b Sf 4 compat & minor tweaks
diff --git a/.php_cs b/.php_cs
@@ -3,21 +3,23 @@
 $header = <<<'EOF'
 This file is part of the "elao/form-simple-object-mapper" package.
 
-Copyright (C) 2016 Elao
+Copyright (C) Elao
 
 @author Elao <contact@elao.com>
 EOF;
 
 $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__)
-    ->exclude(__DIR__ . '/tests/Fixtures/Integration/Symfony/app/cache')
+    ->exclude('tests/Fixtures/Integration/Symfony/app/cache')
 ;
 
 return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
     ->setUsingCache(true)
     ->setFinder($finder)
     ->setRules([
         '@Symfony' => true,
+        'php_unit_namespaced' => true,
         'psr0' => false,
         'concat_space' => ['spacing' => 'one'],
         'phpdoc_summary' => false,
@@ -27,5 +29,6 @@ return PhpCsFixer\Config::create()
         'ordered_imports' => true,
         'simplified_null_return' => false,
         'header_comment' => ['header' => $header],
+        'yoda_style' => null,
     ])
 ;
diff --git a/.travis.yml b/.travis.yml
@@ -10,31 +10,49 @@ env:
         - CHECK_PHP_SYNTAX="no"
         - ENABLE_CODE_COVERAGE="no"
         - COMPOSER_FLAGS=""
+        - SYMFONY_VERSION=""
 
 matrix:
     fast_finish: true
     include:
+         # coverage
+        - php: 7.2
+          env: ENABLE_CODE_COVERAGE="yes"
+
+        # oldest supported versions
         - php: 5.6
           env: COMPOSER_FLAGS="--prefer-lowest"
-        - php: 7.0
-          env: ENABLE_CODE_COVERAGE="yes"
+
+        # common versions
         - php: 7.1
-          env: CHECK_PHP_SYNTAX="yes"
+          env:
+            - SYMFONY_VERSION="3.4.*"
+            - CHECK_CODE_STYLE="yes"
+        - php: 7.2
+          env: SYMFONY_VERSION="4.0.*"
+
+        # bleeding edge (unreleased dev versions where failures are allowed)
+        - php: nightly
+          env: SYMFONY_VERSION="4.1.*"
+    allow_failures:
+      - php: nightly
 
 cache:
     directories:
         - $HOME/.composer/cache
 
 before_install:
-    - if [[ "$ENABLE_CODE_COVERAGE" != "yes" ]]; then phpenv config-rm xdebug.ini || true; fi;
+  - if [[ "$ENABLE_CODE_COVERAGE" != "yes" ]]; then phpenv config-rm xdebug.ini || true; fi;
+  - if [[ "$SYMFONY_VERSION" != "" ]]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
+  - if [[ "$CHECK_CODE_STYLE" != "yes" ]]; then composer remove "friendsofphp/php-cs-fixer" --no-update --no-interaction --dev; fi;
 
 install:
-    - composer update --prefer-dist --no-interaction --optimize-autoloader --prefer-stable --no-progress $COMPOSER_FLAGS
-    - if [[ "$ENABLE_CODE_COVERAGE" == "yes" ]]; then composer require --dev satooshi/php-coveralls; fi
+  - composer update --prefer-dist --no-interaction --optimize-autoloader --prefer-stable --no-progress $COMPOSER_FLAGS
+  - if [[ "$ENABLE_CODE_COVERAGE" == "yes" ]]; then composer require --dev satooshi/php-coveralls; fi;
 
 script:
-    - if [[ "$ENABLE_CODE_COVERAGE" == "yes" ]]; then vendor/bin/phpunit --coverage-text --coverage-clover build/logs/clover.xml; else vendor/bin/phpunit; fi;
-    - if [[ "$CHECK_PHP_SYNTAX" == "yes" ]]; then vendor/bin/php-cs-fixer fix --config=.php_cs --dry-run --no-interaction --diff --path-mode=intersection; fi;
+  - if [[ "$ENABLE_CODE_COVERAGE" == "yes" ]]; then vendor/bin/simple-phpunit --coverage-text --coverage-clover build/logs/clover.xml; else vendor/bin/simple-phpunit; fi;
+  - if [[ "$CHECK_CODE_STYLE" == "yes" ]]; then PHP_CS_FIXER_FUTURE_MODE=1 vendor/bin/php-cs-fixer fix --config=.php_cs --dry-run --no-interaction --diff; fi;
 
 after_success:
-    - if [[ "$ENABLE_CODE_COVERAGE" == "yes" ]]; then php vendor/bin/coveralls -v; fi;
+  - if [[ "$ENABLE_CODE_COVERAGE" == "yes" ]]; then php vendor/bin/coveralls -v; fi;
diff --git a/README.md b/README.md
@@ -4,12 +4,10 @@ Symfony Form Simple Object Mapper
 [![Latest Stable Version](https://poser.pugx.org/elao/form-simple-object-mapper/v/stable?format=flat-square)](https://packagist.org/packages/elao/form-simple-object-mapper) 
 [![Total Downloads](https://poser.pugx.org/elao/form-simple-object-mapper/downloads?format=flat-square)](https://packagist.org/packages/elao/form-simple-object-mapper) 
 [![Monthly Downloads](https://poser.pugx.org/elao/form-simple-object-mapper/d/monthly?format=flat-square)](https://packagist.org/packages/elao/form-simple-object-mapper)
-[![Latest Unstable Version](https://poser.pugx.org/elao/form-simple-object-mapper/v/unstable?format=flat-square)](https://packagist.org/packages/elao/form-simple-object-mapper)
-[![License](https://poser.pugx.org/elao/form-simple-object-mapper/license?format=flat-square)](https://packagist.org/packages/elao/form-simple-object-mapper)
 [![Build Status](https://img.shields.io/travis/Elao/FormSimpleObjectMapper/master.svg?style=flat-square)](https://travis-ci.org/Elao/FormSimpleObjectMapper)
 [![Coveralls](https://img.shields.io/coveralls/Elao/FormSimpleObjectMapper.svg?style=flat-square)](https://coveralls.io/github/Elao/FormSimpleObjectMapper)
 [![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/Elao/FormSimpleObjectMapper.svg?style=flat-square)](https://scrutinizer-ci.com/g/Elao/FormSimpleObjectMapper/?branch=master)
-[![Symfony](https://img.shields.io/badge/Symfony-%202.8%2F3.1%2B-green.svg?style=flat-square "Available for Symfony 2.8 and 3.1+")](https://symfony.com)
+[![Symfony](https://img.shields.io/badge/Symfony-%202.8%2F3.4%2F4.0%2B-green.svg?style=flat-square "Available for Symfony 2.8, 3.4 and 4.0+")](https://symfony.com)
 [![php](https://img.shields.io/badge/PHP-7-green.svg?style=flat-square "Available for PHP 7+")](http://php.net/)
 
 This library aims to ease immutable or value objects mapping with the Symfony Form component, based on [Bernhard Schussek (Webmozart)](https://github.com/webmozart)'s blog post: ["Value Objects in Symfony Forms"](https://webmozart.io/blog/2015/09/09/value-objects-in-symfony-forms/), until a decision on https://github.com/symfony/symfony/pull/19367 is made.
diff --git a/composer.json b/composer.json
@@ -25,28 +25,33 @@
     },
     "prefer-stable": true,
     "minimum-stability": "dev",
+    "config": {
+        "sort-packages": true
+    },
     "require": {
         "php": ">=5.6",
-        "symfony/form": "^2.8|^3.1"
+        "symfony/form": "^2.8|^3.1|^4.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.0",
-        "phpunit/phpunit": "^5.6",
-        "symfony/browser-kit": "^2.8|^3.1",
-        "symfony/css-selector": "^2.8|^3.1",
-        "symfony/dom-crawler": "^2.8|^3.1",
-        "symfony/filesystem": "^2.8|^3.1",
-        "symfony/framework-bundle": "^2.8|^3.1",
-        "symfony/http-foundation": "^2.8|^3.1",
-        "symfony/phpunit-bridge": "^2.8|^3.1",
-        "symfony/twig-bundle": "^2.8|^3.1",
-        "symfony/validator": "^2.8|^3.1",
-        "symfony/var-dumper": "^2.8.11|^3.1",
-        "symfony/templating": "^2.8|^3.1"
+        "friendsofphp/php-cs-fixer": "^2.8",
+        "phpspec/prophecy": "~1.0",
+        "symfony/browser-kit": "^2.8|^3.4|^4.0",
+        "symfony/css-selector": "^2.8|^3.4|^4.0",
+        "symfony/dom-crawler": "^2.8|^3.4|^4.0",
+        "symfony/finder": "^2.8.11|^3.4|^4.0",
+        "symfony/filesystem": "^2.8|^3.4|^4.0",
+        "symfony/framework-bundle": "^2.8|^3.4|^4.0",
+        "symfony/http-foundation": "^2.8|^3.4|^4.0",
+        "symfony/phpunit-bridge": "^3.4|^4.0",
+        "symfony/templating": "^2.8|^3.4|^4.0",
+        "symfony/twig-bundle": "^2.8|^3.4|^4.0",
+        "symfony/validator": "^2.8|^3.4|^4.0",
+        "symfony/var-dumper": "^2.8.11|^3.4|^4.0",
+        "symfony/yaml": "^2.8.11|^3.4|^4.0"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "1.1.x-dev"
         }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -13,6 +13,7 @@
 >
     <php>
         <server name="KERNEL_DIR" value="tests/Fixtures/Integration/Symfony/app/" />
+        <server name="KERNEL_CLASS" value="AppKernel" />
     </php>
     <testsuites>
         <testsuite name="Elao Symfony Form Simple Object Mapper Test Suite">
diff --git a/src/Bridge/Symfony/Bundle/ElaoFormSimpleObjectMapperBundle.php b/src/Bridge/Symfony/Bundle/ElaoFormSimpleObjectMapperBundle.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the "elao/form-simple-object-mapper" package.
  *
- * Copyright (C) 2016 Elao
+ * Copyright (C) Elao
  *
  * @author Elao <contact@elao.com>
  */
diff --git a/src/DataMapper/CallbackFormDataToObjectConverter.php b/src/DataMapper/CallbackFormDataToObjectConverter.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the "elao/form-simple-object-mapper" package.
  *
- * Copyright (C) 2016 Elao
+ * Copyright (C) Elao
  *
  * @author Elao <contact@elao.com>
  */
diff --git a/src/DataMapper/FormDataToObjectConverterInterface.php b/src/DataMapper/FormDataToObjectConverterInterface.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the "elao/form-simple-object-mapper" package.
  *
- * Copyright (C) 2016 Elao
+ * Copyright (C) Elao
  *
  * @author Elao <contact@elao.com>
  */
diff --git a/src/DataMapper/ObjectToFormDataConverterInterface.php b/src/DataMapper/ObjectToFormDataConverterInterface.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the "elao/form-simple-object-mapper" package.
  *
- * Copyright (C) 2016 Elao
+ * Copyright (C) Elao
  *
  * @author Elao <contact@elao.com>
  */
diff --git a/src/DataMapper/SimpleObjectMapper.php b/src/DataMapper/SimpleObjectMapper.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the "elao/form-simple-object-mapper" package.
  *
- * Copyright (C) 2016 Elao
+ * Copyright (C) Elao
  *
  * @author Elao <contact@elao.com>
  */
diff --git a/src/Type/Extension/SimpleObjectMapperTypeExtension.php b/src/Type/Extension/SimpleObjectMapperTypeExtension.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the "elao/form-simple-object-mapper" package.
  *
- * Copyright (C) 2016 Elao
+ * Copyright (C) Elao
  *
  * @author Elao <contact@elao.com>
  */
diff --git a/tests/Fixtures/Integration/Symfony/Acme/Command/AddItemToCartCommand.php b/tests/Fixtures/Integration/Symfony/Acme/Command/AddItemToCartCommand.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the "elao/form-simple-object-mapper" package.
  *
- * Copyright (C) 2016 Elao
+ * Copyright (C) Elao
  *
  * @author Elao <contact@elao.com>
  */
diff --git a/tests/Fixtures/Integration/Symfony/TestBundle/Controller/CartController.php b/tests/Fixtures/Integration/Symfony/TestBundle/Controller/CartController.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the "elao/form-simple-object-mapper" package.
  *
- * Copyright (C) 2016 Elao
+ * Copyright (C) Elao
  *
  * @author Elao <contact@elao.com>
  */
diff --git a/tests/Fixtures/Integration/Symfony/TestBundle/Controller/MediaController.php b/tests/Fixtures/Integration/Symfony/TestBundle/Controller/MediaController.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the "elao/form-simple-object-mapper" package.
  *
- * Copyright (C) 2016 Elao
+ * Copyright (C) Elao
  *
  * @author Elao <contact@elao.com>
  */
diff --git a/tests/Fixtures/Integration/Symfony/TestBundle/Form/Type/AddItemToCartType.php b/tests/Fixtures/Integration/Symfony/TestBundle/Form/Type/AddItemToCartType.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the "elao/form-simple-object-mapper" package.
  *
- * Copyright (C) 2016 Elao
+ * Copyright (C) Elao
  *
  * @author Elao <contact@elao.com>
  */
diff --git a/tests/Fixtures/Integration/Symfony/TestBundle/TestBundle.php b/tests/Fixtures/Integration/Symfony/TestBundle/TestBundle.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the "elao/form-simple-object-mapper" package.
  *
- * Copyright (C) 2016 Elao
+ * Copyright (C) Elao
  *
  * @author Elao <contact@elao.com>
  */
diff --git a/tests/Fixtures/Integration/Symfony/app/AppKernel.php b/tests/Fixtures/Integration/Symfony/app/AppKernel.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the "elao/form-simple-object-mapper" package.
  *
- * Copyright (C) 2016 Elao
+ * Copyright (C) Elao
  *
  * @author Elao <contact@elao.com>
  */
diff --git a/tests/Fixtures/Integration/Symfony/app/bootstrap.php b/tests/Fixtures/Integration/Symfony/app/bootstrap.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the "elao/form-simple-object-mapper" package.
  *
- * Copyright (C) 2016 Elao
+ * Copyright (C) Elao
  *
  * @author Elao <contact@elao.com>
  */
diff --git a/tests/Fixtures/Integration/Symfony/app/config/config.yml b/tests/Fixtures/Integration/Symfony/app/config/config.yml
@@ -1,13 +1,21 @@
 framework:
-    secret:                           'elao'
-    form:                             true
+    secret: 'elao'
+    form: true
     router:
-        resource:                     '%kernel.root_dir%/config/routing.yml'
-        strict_requirements:          '%kernel.debug%'
-    test:                              ~
+        resource: '%kernel.root_dir%/config/routing.yml'
+        strict_requirements: '%kernel.debug%'
+    test: ~
     session:
-        storage_id:                    'session.storage.mock_file'
+        storage_id: 'session.storage.mock_file'
     templating:
-        engines:                       ['twig']
+        engines: ['twig']
     assets: false
-    annotations: false
+    validation: { enable_annotations: false }
+
+twig:
+    strict_variables: true
+
+services:
+    logger:
+        class: Psr\Log\NullLogger
+        public: false
diff --git a/tests/Fixtures/Integration/Symfony/app/config/routing.yml b/tests/Fixtures/Integration/Symfony/app/config/routing.yml
@@ -1,7 +1,9 @@
 add_item_to_cart:
     path: '/cart/add-item'
-    defaults: { _controller: 'TestBundle:Cart:addItem' }
+    defaults:
+        _controller: 'Elao\FormSimpleObjectMapper\Tests\Fixtures\Integration\Symfony\TestBundle\Controller\CartController::addItemAction'
 
 edit_media:
     path: '/media/edit'
-    defaults: { _controller: 'TestBundle:Media:edit' }
+    defaults:
+        _controller: 'Elao\FormSimpleObjectMapper\Tests\Fixtures\Integration\Symfony\TestBundle\Controller\MediaController::editAction'
diff --git a/tests/Fixtures/Media/Book.php b/tests/Fixtures/Media/Book.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the "elao/form-simple-object-mapper" package.
  *
- * Copyright (C) 2016 Elao
+ * Copyright (C) Elao
  *
  * @author Elao <contact@elao.com>
  */
diff --git a/tests/Fixtures/Media/Media.php b/tests/Fixtures/Media/Media.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the "elao/form-simple-object-mapper" package.
  *
- * Copyright (C) 2016 Elao
+ * Copyright (C) Elao
  *
  * @author Elao <contact@elao.com>
  */
diff --git a/tests/Fixtures/Media/MediaConverter.php b/tests/Fixtures/Media/MediaConverter.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the "elao/form-simple-object-mapper" package.
  *
- * Copyright (C) 2016 Elao
+ * Copyright (C) Elao
  *
  * @author Elao <contact@elao.com>
  */
diff --git a/tests/Fixtures/Media/Movie.php b/tests/Fixtures/Media/Movie.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the "elao/form-simple-object-mapper" package.
  *
- * Copyright (C) 2016 Elao
+ * Copyright (C) Elao
  *
  * @author Elao <contact@elao.com>
  */
diff --git a/tests/Fixtures/Money.php b/tests/Fixtures/Money.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the "elao/form-simple-object-mapper" package.
  *
- * Copyright (C) 2016 Elao
+ * Copyright (C) Elao
  *
  * @author Elao <contact@elao.com>
  */
diff --git a/tests/Fixtures/MoneyType.php b/tests/Fixtures/MoneyType.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the "elao/form-simple-object-mapper" package.
  *
- * Copyright (C) 2016 Elao
+ * Copyright (C) Elao
  *
  * @author Elao <contact@elao.com>
  */
diff --git a/tests/Fixtures/MoneyTypeConverter.php b/tests/Fixtures/MoneyTypeConverter.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the "elao/form-simple-object-mapper" package.
  *
- * Copyright (C) 2016 Elao
+ * Copyright (C) Elao
  *
  * @author Elao <contact@elao.com>
  */
diff --git a/tests/Fixtures/SimpleObjectMapperFormExtension.php b/tests/Fixtures/SimpleObjectMapperFormExtension.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the "elao/form-simple-object-mapper" package.
  *
- * Copyright (C) 2016 Elao
+ * Copyright (C) Elao
  *
  * @author Elao <contact@elao.com>
  */
diff --git a/tests/Integration/FormTypeTest.php b/tests/Integration/FormTypeTest.php
diff --git a/tests/Integration/SymfonyFullStackIntegrationTest.php b/tests/Integration/SymfonyFullStackIntegrationTest.php
diff --git a/tests/Unit/DataMapper/CallbackFormDataToObjectConverterTest.php b/tests/Unit/DataMapper/CallbackFormDataToObjectConverterTest.php
diff --git a/tests/Unit/DataMapper/SimpleObjectMapperTest.php b/tests/Unit/DataMapper/SimpleObjectMapperTest.php

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`>`
`14`	`14`	`<php>`
`15`	`15`	`<server name="KERNEL_DIR" value="tests/Fixtures/Integration/Symfony/app/" />`
	`16`	`+ <server name="KERNEL_CLASS" value="AppKernel" />`
`16`	`17`	`</php>`
`17`	`18`	`<testsuites>`
`18`	`19`	`<testsuite name="Elao Symfony Form Simple Object Mapper Test Suite">`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`/*`
`4`	`4`	`* This file is part of the "elao/form-simple-object-mapper" package.`
`5`	`5`	`*`
`6`		`- * Copyright (C) 2016 Elao`
	`6`	`+ * Copyright (C) Elao`
`7`	`7`	`*`
`8`	`8`	`* @author Elao <contact@elao.com>`
`9`	`9`	`*/`