Merge branch '2.5'

* 2.5:
  Fix spelling
  Fix removal of illegal characters in schema name for Amazon API Gateway
  Add links to documentation to ApiResource properties
  fix #3189 - JSONAPI pagination ignored when using filter parameter

Author: dunglas

CHANGELOG.md

@@ -424,7 +424,7 @@ Please read #2825 if you have issues with the behavior of Readable/Writable Link
 * Persist data in Doctrine DataPersister only if needed
 * Fix identifiers handling in GraphQL mutations
 * Fix client-side ID creation or update when using GraphQL mutations
-* Fix an error that was occuring when the Expression Language component wasn't installed
+* Fix an error that was occurring when the Expression Language component wasn't installed
 * Update the `ChainSubresourceDataProvider` class to take into account `RestrictedDataProviderInterface`
 
 ## 2.2.4

features/jsonapi/filtering.feature

@@ -23,6 +23,14 @@ Feature: JSON API filter handling
     And the JSON should be valid according to the JSON API schema
     And the JSON node "data" should have 0 elements
 
+  Scenario: Apply filters and pagination at the same time
+    When I send a "GET" request to "/dummies?filter[name]=foo&page[page]=2"
+    Then the response status code should be 200
+    And the response should be in JSON
+    And the JSON should be valid according to the JSON API schema
+    Then the JSON node "meta.currentPage" should be a number
+    Then the JSON node "meta.currentPage" should be equal to "2"
+
   Scenario: Apply property filter based on the 'fields'
     Given there are 2 dummy property objects
     When I send a "GET" request to "/dummy_properties?fields[DummyProperty]=id,foo,bar"

features/main/subresource.feature

@@ -24,7 +24,7 @@ Feature: Subresource support
     }
     """
 
-  Scenario: Get a non existant subresource
+  Scenario: Get a non existent subresource
     Given there is an answer "42" to the question "What's the answer to the Ultimate Question of Life, the Universe and Everything?"
     When I send a "GET" request to "/questions/999999/answer"
     Then the response status code should be 404