Merge remote-tracking branch 'origin/3.x'

.php_cs.dist

@@ -37,6 +37,7 @@ $rules = [
     '@PHP56Migration' => true,
     '@PHP56Migration:risky' => true,
     '@PHPUnit57Migration:risky' => true,
+    'single_line_throw' => false,
     '@PHP70Migration' => true,
     '@PHP70Migration:risky' => true,
     '@PHPUnit60Migration:risky' => true,

.travis.yml

@@ -12,6 +12,7 @@ language: php
 php:
   - '7.2'
   - '7.3'
+  - '7.4snapshot'
   - nightly
 
 dist: xenial
@@ -37,27 +38,28 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: '7.3'
+    - php: '7.4snapshot'
       env: TARGET=docs
-    - php: '7.3'
+    - php: '7.4snapshot'
       env: TARGET=lint
     - php: '7.2'
       env: COMPOSER_FLAGS="--prefer-lowest"
-    - php: '7.3'
+    - php: '7.4snapshot'
       env: SYMFONY=3.4.*
-    - php: '7.3'
+    - php: '7.4snapshot'
       env: SYMFONY='dev-master as 3.4.x-dev'
-    - php: '7.3'
+    - php: '7.4snapshot'
       env: SONATA_CORE=3.*
-    - php: '7.3'
+    - php: '7.4snapshot'
       env: SONATA_CORE='dev-master as 3.x-dev'
-    - php: '7.3'
+    - php: '7.4snapshot'
       env: SONATA_ADMIN=3.*
-    - php: '7.3'
+    - php: '7.4snapshot'
       env: SONATA_ADMIN='dev-master as 3.x-dev'
-    - php: '7.3'
+    - php: '7.4snapshot'
       env: SYMFONY_DEPRECATIONS_HELPER=0
   allow_failures:
+    - php: 7.4snapshot
     - php: nightly
     - env: SYMFONY_DEPRECATIONS_HELPER=0
     - env: SYMFONY='dev-master as 3.4.x-dev'

.travis/install_test.sh

@@ -10,10 +10,4 @@ chmod u+x "${HOME}/bin/phpunit"
 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

@@ -2,6 +2,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.11.0](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/compare/3.10.0...3.11.0) - 2019-11-03
+### Fixed
+- Fix a break BC error
+
+### Changed
+Create const for operator choices in Filter classes
+
 ## [3.10.0](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/compare/3.9.0...3.10.0) - 2019-07-20
 ### Added
 - Don't hide edit button `sonata_type_model_list_widget` if there is no value

src/Filter/AbstractDateFilter.php

@@ -21,6 +21,16 @@
 
 abstract class AbstractDateFilter extends Filter
 {
+    public const CHOICES = [
+        DateType::TYPE_EQUAL => '=',
+        DateType::TYPE_GREATER_EQUAL => '>=',
+        DateType::TYPE_GREATER_THAN => '>',
+        DateType::TYPE_LESS_EQUAL => '<=',
+        DateType::TYPE_LESS_THAN => '<',
+        DateType::TYPE_NULL => 'NULL',
+        DateType::TYPE_NOT_NULL => 'NOT NULL',
+    ];
+
     /**
      * Flag indicating that filter will have range.
      *
@@ -178,16 +188,6 @@ protected function getOperator($type)
     {
         $type = (int) $type;
 
-        $choices = [
-            DateType::TYPE_EQUAL => '=',
-            DateType::TYPE_GREATER_EQUAL => '>=',
-            DateType::TYPE_GREATER_THAN => '>',
-            DateType::TYPE_LESS_EQUAL => '<=',
-            DateType::TYPE_LESS_THAN => '<',
-            DateType::TYPE_NULL => 'NULL',
-            DateType::TYPE_NOT_NULL => 'NOT NULL',
-        ];
-
-        return $choices[$type] ?? '=';
+        return self::CHOICES[$type] ?? '=';
     }
 }

src/Filter/ClassFilter.php

@@ -21,6 +21,11 @@
 
 class ClassFilter extends Filter
 {
+    public const CHOICES = [
+        EqualType::TYPE_IS_EQUAL => 'INSTANCE OF',
+        EqualType::TYPE_IS_NOT_EQUAL => 'NOT INSTANCE OF',
+    ];
+
     public function filter(ProxyQueryInterface $queryBuilder, $alias, $field, $data): void
     {
         if (!$data || !\is_array($data) || !\array_key_exists('value', $data)) {
@@ -83,11 +88,6 @@ public function getRenderSettings()
      */
     private function getOperator($type)
     {
-        $choices = [
-            EqualType::TYPE_IS_EQUAL => 'INSTANCE OF',
-            EqualType::TYPE_IS_NOT_EQUAL => 'NOT INSTANCE OF',
-        ];
-
-        return $choices[$type] ?? false;
+        return self::CHOICES[$type] ?? false;
     }
 }

src/Filter/NumberFilter.php

@@ -18,6 +18,14 @@
 
 class NumberFilter extends Filter
 {
+    public const CHOICES = [
+        NumberType::TYPE_EQUAL => '=',
+        NumberType::TYPE_GREATER_EQUAL => '>=',
+        NumberType::TYPE_GREATER_THAN => '>',
+        NumberType::TYPE_LESS_EQUAL => '<=',
+        NumberType::TYPE_LESS_THAN => '<',
+    ];
+
     public function filter(ProxyQueryInterface $queryBuilder, $alias, $field, $data): void
     {
         if (!$data || !\is_array($data) || !\array_key_exists('value', $data) || !is_numeric($data['value'])) {
@@ -59,14 +67,6 @@ public function getRenderSettings()
      */
     private function getOperator($type)
     {
-        $choices = [
-            NumberType::TYPE_EQUAL => '=',
-            NumberType::TYPE_GREATER_EQUAL => '>=',
-            NumberType::TYPE_GREATER_THAN => '>',
-            NumberType::TYPE_LESS_EQUAL => '<=',
-            NumberType::TYPE_LESS_THAN => '<',
-        ];
-
-        return $choices[$type] ?? false;
+        return self::CHOICES[$type] ?? false;
     }
 }

src/Filter/StringFilter.php

@@ -18,6 +18,12 @@
 
 class StringFilter extends Filter
 {
+    public const CHOICES = [
+        ChoiceType::TYPE_CONTAINS => 'LIKE',
+        ChoiceType::TYPE_NOT_CONTAINS => 'NOT LIKE',
+        ChoiceType::TYPE_EQUAL => '=',
+    ];
+
     public function filter(ProxyQueryInterface $queryBuilder, $alias, $field, $data): void
     {
         if (!$data || !\is_array($data) || !\array_key_exists('value', $data) || null === $data['value']) {
@@ -91,12 +97,6 @@ public function getRenderSettings()
      */
     private function getOperator($type)
     {
-        $choices = [
-            ChoiceType::TYPE_CONTAINS => 'LIKE',
-            ChoiceType::TYPE_NOT_CONTAINS => 'NOT LIKE',
-            ChoiceType::TYPE_EQUAL => '=',
-        ];
-
-        return $choices[$type] ?? false;
+        return self::CHOICES[$type] ?? false;
     }
 }