Merge branch '1.0'

* 1.0: Suspend PHP 7.2 support Use sprintf function in exception message in Metadata:parseAlias Exception message in Metadata:parseAlias is now more explanatory [Bug] [Admin] fixed filter reset after changing grid page limits
ezecosystem · Nov 10, 2017 · b78e37d · b78e37d
2 parents 8647920 + 0e8c3f7
commit b78e37d
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 111 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,14 +17,6 @@ matrix:
                 - TRAVIS_NODE_VERSION="6.11"
             services:
                 - memcached
-        -
-            sudo: required
-            php: 7.2
-            env:
-                - SYLIUS_SUITE="application"
-                - TRAVIS_NODE_VERSION="6.11"
-            services:
-                - memcached
         -
             sudo: false
             php: 7.1
@@ -33,6 +25,14 @@ matrix:
                 apt:
                     packages:
                         - parallel
+        -
+            sudo: required
+            php: 7.2
+            env:
+                - SYLIUS_SUITE="application"
+                - TRAVIS_NODE_VERSION="6.11"
+            services:
+                - memcached
         -
             sudo: false
             php: 7.2
@@ -41,6 +41,9 @@ matrix:
                 apt:
                     packages:
                         - parallel
+    allow_failures:
+        - php: 7.2
+    fast_finish: true
 
 cache:
     yarn: true

diff --git a/composer.json b/composer.json
@@ -37,11 +37,10 @@
         "fzaninotto/faker": "^1.6",
         "gedmo/doctrine-extensions": "^2.4.12",
         "incenteev/composer-parameter-handler": "^2.1",
-        "jeremykendall/php-domain-parser": "^4.0.3@alpha",
         "jms/serializer-bundle": "^2.0",
         "knplabs/knp-gaufrette-bundle": "^0.3",
         "knplabs/knp-menu-bundle": "^2.1",
-        "league/uri": "^4.2.3",
+        "league/uri": "^4.2.2",
         "liip/imagine-bundle": "^1.9.1",
         "ocramius/proxy-manager": "^2.1",
         "payum/payum": "^1.4",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Macro/pagination.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Macro/pagination.html.twig
@@ -10,7 +10,7 @@
         <i class="dropdown icon"></i>
         <div class="menu">
         {% for limit in paginationLimits if limit != paginator.maxPerPage %}
-            {% set path = path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')|merge({'limit': limit})) %}
+            {% set path = path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')|merge(app.request.query)|merge({'limit': limit})) %}
             <a class="item" href="{{ path }}">{{ limit }}</a>
         {% endfor %}
         </div>

diff --git a/src/Sylius/Component/Resource/Metadata/Metadata.php b/src/Sylius/Component/Resource/Metadata/Metadata.php
@@ -199,7 +199,7 @@ public function getPermissionCode(string $permissionName): string
     private static function parseAlias(string $alias): array
     {
         if (false === strpos($alias, '.')) {
-            throw new \InvalidArgumentException('Invalid alias supplied, it should conform to the following format "<applicationName>.<name>".');
+            throw new \InvalidArgumentException(sprintf('Invalid alias "%s" supplied, it should conform to the following format "<applicationName>.<name>".', $alias));
         }
 
         return explode('.', $alias);