DevKit updates

.gitignore

@@ -2,3 +2,6 @@ vendor/
 composer.lock
 tests/Fixtures/App/var
 !tests/Fixtures/App/var/.gitempty
+build
+.phpunit
+.php_cs.cache

.php_cs.dist

@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * DO NOT EDIT THIS FILE!
+ *
+ * It's auto-generated by sonata-project/dev-kit package.
+ */
+
+$header = <<<'HEADER'
+This file is part of the Symfony CMF package.
+
+(c) Symfony CMF
+
+For the full copyright and license information, please view the LICENSE
+file that was distributed with this source code.
+HEADER;
+
+$rules = [
+    '@Symfony' => true,
+    '@Symfony:risky' => true,
+    'array_syntax' => [
+        'syntax' => 'short',
+    ],
+    'combine_consecutive_issets' => true,
+    'combine_consecutive_unsets' => true,
+    'header_comment' => [
+        'header' => $header,
+    ],
+    'no_extra_blank_lines' => true,
+    'no_php4_constructor' => true,
+    'no_useless_else' => true,
+    'no_useless_return' => true,
+    'ordered_class_elements' => true,
+    'ordered_imports' => true,
+    'phpdoc_order' => true,
+    '@PHP56Migration' => true,
+    '@PHP56Migration:risky' => true,
+    '@PHPUnit57Migration:risky' => true,
+    '@PHP70Migration' => true,
+    '@PHP70Migration:risky' => true,
+    '@PHPUnit60Migration:risky' => true,
+    '@PHP71Migration' => true,
+    '@PHP71Migration:risky' => true,
+    'compact_nullable_typehint' => true,
+    'void_return' => null,
+    'strict_comparison' => true,
+    'strict_param' => true,
+];
+
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__)
+    ->exclude('Tests/Fixtures')
+    ->exclude('tests/Fixtures')
+    ->exclude('Resources/skeleton')
+    ->exclude('Resources/public/vendor')
+;
+
+return PhpCsFixer\Config::create()
+    ->setFinder($finder)
+    ->setRiskyAllowed(true)
+    ->setRules($rules)
+    ->setUsingCache(true)
+;

.styleci.yml

@@ -7,7 +7,7 @@
 ############################################################################
 # This file is part of the Symfony CMF package.                            #
 #                                                                          #
-# (c) 2011-2017 Symfony CMF                                                #
+# (c) Symfony CMF                                                #
 #                                                                          #
 # For the full copyright and license information, please view the LICENSE  #
 # file that was distributed with this source code.                         #

.travis.yml

@@ -7,7 +7,7 @@
 ############################################################################
 # This file is part of the Symfony CMF package.                            #
 #                                                                          #
-# (c) 2011-2017 Symfony CMF                                                #
+# (c) Symfony CMF                                                #
 #                                                                          #
 # For the full copyright and license information, please view the LICENSE  #
 # file that was distributed with this source code.                         #
@@ -17,7 +17,8 @@ language: php
 
 php:
   - 7.1
-
+  - 7.2
+  - 7.3
 sudo: false
 
 cache:
@@ -26,26 +27,32 @@ cache:
     - $HOME/.composer/cache/files
 
 env:
-  matrix: SYMFONY_VERSION=4.0.*
+  matrix: SYMFONY_VERSION=4.2.*
   global:
     - SYMFONY_DEPRECATIONS_HELPER="/.*each.*/"
     - SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
-    - KERNEL_CLASS=Symfony\Cmf\Bundle\BlockBundle\Tests\Fixtures\App\Kernel
-    - SYMFONY_PHPUNIT_VERSION=5.7
-    - TEST_INSTALLATION=false
+    - SYMFONY_PHPUNIT_VERSION=7
+    - PHPUNIT_VERSION=7
+    - TARGET=test
 
 matrix:
   include:
-    - php: 7.2
-      env: SYMFONY_VERSION=4.0.*
+    - env: TARGET=lint
+    - php: 7.3
+      env: STABILITY="dev" SYMFONY_VERSION=4.3.*
+    - php: 7.3
+      env: SYMFONY_VERSION=4.2.*
     - php: 7.1
-      env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
-    - php: 7.2
-      env: SYMFONY_VERSION=3.3.*
+      env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=3.4.* SYMFONY_DEPRECATIONS_HELPER="/.*each.*/"
+
     - php: 7.2
-      env: SYMFONY_VERSION=3.4.*
+      env: SYMFONY_VERSION=4.1.*
+    - env: TARGET=test_installation
   fast_finish: true
   allow_failures:
+    - php: 7.3
+      env: STABILITY="dev" SYMFONY_VERSION=4.3.*
+    - env: TARGET=test_installation
 
 before_install:
   - phpenv config-rm xdebug.ini || true
@@ -58,9 +65,12 @@ before_install:
 install:
   - phpenv config-add travis.php.ini
   - php -ini | grep memory_limit
-  - travis_wait composer update --prefer-dist $COMPOSER_FLAGS
-script:
-  - if [ "${TEST_INSTALLATION}" == true ]; then make test_installation; else make test; fi
+  - if [ -x .travis/install_${TARGET}.sh ]; then .travis/install_${TARGET}.sh; fi;
+
+script: make $TARGET
+
+after_success:
+  - if [ -x .travis/after_success_${TARGET}.sh ]; then .travis/after_success_${TARGET}.sh; fi;
 
 notifications:
   irc: "irc.freenode.org#symfony-cmf"

.travis/after_success_test.sh

@@ -0,0 +1,5 @@
+
+#!/usr/bin/env sh
+set -ev
+
+coveralls -v

.travis/install_lint.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+set -ev
+
+mkdir --parents "${HOME}/bin"
+
+wget "http://cs.sensiolabs.org/download/php-cs-fixer-v2.phar" --output-document="${HOME}/bin/php-cs-fixer"
+chmod u+x "${HOME}/bin/php-cs-fixer"
+
+composer global require sllh/composer-lint:@stable --prefer-dist --no-interaction
+
+gem install yaml-lint

.travis/install_test.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env sh
+set -ev
+
+mkdir --parents "${HOME}/bin"
+
+wget "https://phar.phpunit.de/phpunit-${PHPUNIT_VERSION}.phar" --output-document="${HOME}/bin/phpunit"
+chmod u+x "${HOME}/bin/phpunit"
+
+# Coveralls client install
+wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar --output-document="${HOME}/bin/coveralls"
+chmod u+x "${HOME}/bin/coveralls"
+
+# To be removed when these issues are resolved:
+# https://github.com/composer/composer/issues/5355
+if [ "${COMPOSER_FLAGS}" = '--prefer-lowest' ]; then
+    composer update --prefer-dist --no-interaction --prefer-stable --quiet
+fi
+
+composer update --prefer-dist --no-interaction --prefer-stable ${COMPOSER_FLAGS}

CHANGELOG.md

@@ -1,9 +1,10 @@
 Changelog
 =========
-3.0.0 (unreleased)
-------------------
 
+2.2.0 (unreleased)
+------------------
 
+* **2019-02-28**: Symfony 4.2 support without warnings
 
 2.1.1
 -----
@@ -20,7 +21,7 @@ Changelog
 
 Release 2.0.0
 
-2.0.0-RC2
+2.0.0-RC2Mo
 ---------
 
  * **2017-02-10**: [BC BREAK] Removed the `ImagineBlock` as the CmfMediaBundle

Makefile

@@ -7,7 +7,7 @@
 ############################################################################
 # This file is part of the Symfony CMF package.                            #
 #                                                                          #
-# (c) 2011-2017 Symfony CMF                                                #
+# (c) Symfony CMF                                                #
 #                                                                          #
 # For the full copyright and license information, please view the LICENSE  #
 # file that was distributed with this source code.                         #
@@ -20,15 +20,63 @@ ifdef BRANCH
 	VERSION=dev-${BRANCH}
 endif
 PACKAGE=symfony-cmf/block-bundle
-export KERNEL_CLASS=Symfony\Cmf\Bundle\BlockBundle\Tests\Fixtures\App\Kernel
+HAS_XDEBUG=$(shell php --modules|grep --quiet xdebug;echo $$?)
+
 list:
 	@echo 'test:                    will run all tests'
 	@echo 'unit_tests:               will run unit tests only'
 	@echo 'functional_tests_phpcr:  will run functional tests with PHPCR'
 
-
-include ${TESTING_SCRIPTS_DIR}/make/unit_tests.mk
-include ${TESTING_SCRIPTS_DIR}/make/functional_tests_phpcr.mk
+	@echo 'test_installation:    will run installation test'TEST_DEPENDENCIES := ""
+EXTRA_INCLUDES:=$(wildcard ${TESTING_SCRIPTS_DIR}/make/unit_tests.mk)
+ifneq ($(strip $(EXTRA_INCLUDES)),)
+  contents :=  $(shell echo including extra rules $(EXTRA_INCLUDES))
+  include $(EXTRA_INCLUDES)
+    TEST_DEPENDENCIES := $(TEST_DEPENDENCIES)" unit_tests"
+  endif
+EXTRA_INCLUDES:=$(wildcard ${TESTING_SCRIPTS_DIR}/make/functional_tests_phpcr.mk)
+ifneq ($(strip $(EXTRA_INCLUDES)),)
+  contents :=  $(shell echo including extra rules $(EXTRA_INCLUDES))
+  include $(EXTRA_INCLUDES)
+    TEST_DEPENDENCIES := $(TEST_DEPENDENCIES)" functional_tests_phpcr"
+  endif
+EXTRA_INCLUDES:=$(wildcard ${TESTING_SCRIPTS_DIR}/make/test_installation.mk)
+ifneq ($(strip $(EXTRA_INCLUDES)),)
+  contents :=  $(shell echo including extra rules $(EXTRA_INCLUDES))
+  include $(EXTRA_INCLUDES)
+  endif
 
 .PHONY: test
-test: unit_tests functional_tests_phpcr
+test: build/xdebug-filter.php$
+ifneq ($(strip $(wildcard ${TESTING_SCRIPTS_DIR}/make/unit_tests.mk)),)
+	@make unit_tests
+endif
+ifneq ($(strip $(wildcard ${TESTING_SCRIPTS_DIR}/make/functional_tests_phpcr.mk)),)
+	@make functional_tests_phpcr
+endif
+
+lint-php:
+	php-cs-fixer fix --ansi --verbose --diff --dry-run
+.PHONY: lint-php
+
+lint: lint-composer lint-php
+.PHONY: lint
+
+lint-composer:
+	composer validate
+.PHONY: lint-composer
+
+cs-fix: cs-fix-php
+.PHONY: cs-fix
+
+cs-fix-php:
+	php-cs-fixer fix --verbose
+.PHONY: cs-fix-php
+
+build:
+	mkdir $@
+
+build/xdebug-filter.php: phpunit.xml.dist build
+ifeq ($(HAS_XDEBUG), 0)
+	phpunit --dump-xdebug-filter $@
+endif

README.md

@@ -10,11 +10,11 @@
 
 Branch | Travis | Coveralls | Scrutinizer |
 ------ | ------ | --------- | ----------- |
-2.x   | [![Build Status][travis_stable_badge]][travis_stable_link]     | [![Coverage Status][coveralls_stable_badge]][coveralls_stable_link]     | [![Scrutinizer Status][scrutinizer_stable_badge]][scrutinizer_stable_link] |
-master | [![Build Status][travis_unstable_badge]][travis_unstable_link] | [![Coverage Status][coveralls_unstable_badge]][coveralls_unstable_link] | [![Scrutinizer Status][scrutinizer_unstable_badge]][scrutinizer_unstable_link] |
+2.1   | [![Build Status][travis_stable_badge]][travis_stable_link]     | [![Coverage Status][coveralls_stable_badge]][coveralls_stable_link]     | [![Scrutinizer Status][scrutinizer_stable_badge]][scrutinizer_stable_link] |
+dev-master | [![Build Status][travis_unstable_badge]][travis_unstable_link] | [![Coverage Status][coveralls_unstable_badge]][coveralls_unstable_link] | [![Scrutinizer Status][scrutinizer_unstable_badge]][scrutinizer_unstable_link] |
 
 
-This package is part of the [Symfony Content Management Framework (CMF)](http://cmf.symfony.com/) and licensed
+This package is part of the [Symfony Content Management Framework (CMF)](https://cmf.symfony.com/) and licensed
 under the [MIT License](LICENSE).
 
 The BlockBundle provides integration with
@@ -26,24 +26,24 @@ provides a few commonly used standard blocks, including the ability to edit them
 
 ## Requirements
 
-* PHP 7.1 / 7.2
-* Symfony 2.8 / 3.3 / 3.4 / 4.0
+* PHP 7.1 / 7.2 / 7.3
+* Symfony 3.4 / 4.1 / 4.2
 * See also the `require` section of [composer.json](composer.json)
 
 ## Documentation
 
 For the install guide and reference, see:
 
-* [symfony-cmf/block-bundle Documentation](http://symfony.com/doc/master/cmf/bundles/block/index.html)
+* [symfony-cmf/block-bundle Documentation](https://symfony.com/doc/master/cmf/bundles/block/index.html)
 
 See also:
 
-* [All Symfony CMF documentation](http://symfony.com/doc/master/cmf/index.html) - complete Symfony CMF reference
-* [Symfony CMF Website](http://cmf.symfony.com/) - introduction, live demo, support and community links
+* [All Symfony CMF documentation](https://symfony.com/doc/master/cmf/index.html) - complete Symfony CMF reference
+* [Symfony CMF Website](https://cmf.symfony.com/) - introduction, live demo, support and community links
 
 ## Support
 
-For general support and questions, please use [StackOverflow](http://stackoverflow.com/questions/tagged/symfony-cmf).
+For general support and questions, please use [StackOverflow](https://stackoverflow.com/questions/tagged/symfony-cmf).
 
 ## Contributing
 
@@ -52,7 +52,7 @@ Pull requests are welcome. Please see our
 guide.
 
 Unit and/or functional tests exist for this package. See the
-[Testing documentation](http://symfony.com/doc/master/cmf/components/testing.html)
+[Testing documentation](https://symfony.com/doc/master/cmf/components/testing.html)
 for a guide to running the tests.
 
 Thanks to
@@ -62,17 +62,17 @@ Thanks to
 
 This package is available under the [MIT license](src/Resources/meta/LICENSE).
 
-[travis_stable_badge]: https://travis-ci.org/symfony-cmf/block-bundle.svg?branch=2.x
+[travis_stable_badge]: https://travis-ci.org/symfony-cmf/block-bundle.svg?branch=2.1
 [travis_stable_link]: https://travis-ci.org/symfony-cmf/block-bundle
-[travis_unstable_badge]: https://travis-ci.org/symfony-cmf/block-bundle.svg?branch=master
+[travis_unstable_badge]: https://travis-ci.org/symfony-cmf/block-bundle.svg?branch=dev-master
 [travis_unstable_link]: https://travis-ci.org/symfony-cmf/block-bundle
 
-[coveralls_stable_badge]: https://coveralls.io/repos/github/symfony-cmf/block-bundle/badge.svg?branch=2.x
-[coveralls_stable_link]: https://coveralls.io/github/symfony-cmf/block-bundle?branch=2.x
-[coveralls_unstable_badge]: https://coveralls.io/repos/github/symfony-cmf/block-bundle/badge.svg?branch=master
-[coveralls_unstable_link]: https://coveralls.io/github/symfony-cmf/block-bundle?branch=master
+[coveralls_stable_badge]: https://coveralls.io/repos/github/symfony-cmf/block-bundle/badge.svg?branch=2.1
+[coveralls_stable_link]: https://coveralls.io/github/symfony-cmf/block-bundle?branch=2.1
+[coveralls_unstable_badge]: https://coveralls.io/repos/github/symfony-cmf/block-bundle/badge.svg?branch=dev-master
+[coveralls_unstable_link]: https://coveralls.io/github/symfony-cmf/block-bundle?branch=dev-master
 
-[scrutinizer_stable_badge]: https://scrutinizer-ci.com/g/symfony-cmf/block-bundle/badges/quality-score.png?b=2.x
-[scrutinizer_stable_link]: https://scrutinizer-ci.com/g/symfony-cmf/block-bundle/?branch=2.x
-[scrutinizer_unstable_badge]: https://scrutinizer-ci.com/g/symfony-cmf/block-bundle/badges/quality-score.png?b=master
-[scrutinizer_unstable_link]: https://scrutinizer-ci.com/g/symfony-cmf/block-bundle/?branch=master
+[scrutinizer_stable_badge]: https://scrutinizer-ci.com/g/symfony-cmf/block-bundle/badges/quality-score.png?b=2.1
+[scrutinizer_stable_link]: https://scrutinizer-ci.com/g/symfony-cmf/block-bundle/?branch=2.1
+[scrutinizer_unstable_badge]: https://scrutinizer-ci.com/g/symfony-cmf/block-bundle/badges/quality-score.png?b=dev-master
+[scrutinizer_unstable_link]: https://scrutinizer-ci.com/g/symfony-cmf/block-bundle/?branch=dev-master