WIP

Author: 27pchrisl

src/EntitySet.php

@@ -579,17 +579,17 @@ public function addTrailingMetadata(Transaction $transaction, MetadataContainer
                         $skipToken = $transaction->getSkipToken();
 
                         if ($skipToken->hasValue()) {
-                            $paginationParams['$top'] = $top->getValue();
-                            $paginationParams['$skiptoken'] = $skipToken->getValue();
+                            $paginationParams[$top::param] = $top->getValue();
+                            $paginationParams[$skipToken::param] = $skipToken->getValue();
                         }
                         break;
 
                     case $this instanceof PaginationInterface:
                         $skip = $transaction->getSkip();
 
                         if ($skip->hasValue() && ($count === null || $skip->getValue() < $count)) {
-                            $paginationParams['$top'] = $top->getValue();
-                            $paginationParams['$skip'] = $skip->getValue();
+                            $paginationParams[$top::param] = $top->getValue();
+                            $paginationParams[$skip::param] = $skip->getValue();
                         }
                         break;
                 }
@@ -598,7 +598,8 @@ public function addTrailingMetadata(Transaction $transaction, MetadataContainer
             if ($paginationParams) {
                 $transactionParams = array_diff_key(
                     $transaction->getQueryParams(),
-                    array_flip(['$top', '$skip', '$skiptoken'])
+                    array_flip([Option\Top::param, Option\Skip::param, Option\SkipToken::param]),
+                    array_flip(['$'.Option\Top::param, '$'.Option\Skip::param, '$'.Option\SkipToken::param]),
                 );
 
                 $metadata['nextLink'] = Url::http_build_url(

tests/Unit/CSV/__snapshots__/CSVTest__test_orderby__1.json

@@ -39,5 +39,5 @@
             "duration": "P2DT17H44M37.225146000012S"
         }
     ],
-    "@nextLink": "http://localhost/odata/csv?%24orderby=name&%24top=4&%24skip=4"
+    "@nextLink": "http://localhost/odata/csv?%24orderby=name&top=4&skip=4"
 }

tests/Unit/CSV/__snapshots__/CSVTest__test_orderby_direction__1.json

@@ -39,5 +39,5 @@
             "duration": "P54DT17H45M8.5999999996275S"
         }
     ],
-    "@nextLink": "http://localhost/odata/csv?%24orderby=name%20desc&%24top=4&%24skip=4"
+    "@nextLink": "http://localhost/odata/csv?%24orderby=name%20desc&top=4&skip=4"
 }

tests/Unit/CSV/__snapshots__/CSVTest__test_pagination__1.json

@@ -26,5 +26,5 @@
             "duration": "PT8H38M9.5408012599983S"
         }
     ],
-    "@nextLink": "http://localhost/odata/csv?%24top=4&%24skip=9"
+    "@nextLink": "http://localhost/odata/csv?top=4&skip=9"
 }

tests/Unit/CSV/__snapshots__/CSVTest__test_pagination__2.json

@@ -26,5 +26,5 @@
             "duration": "PT6S"
         }
     ],
-    "@nextLink": "http://localhost/odata/csv?%24top=4&%24skip=13"
+    "@nextLink": "http://localhost/odata/csv?top=4&skip=13"
 }

tests/Unit/Options/__snapshots__/CountTest__test_count_ignores_top__1.json

@@ -13,5 +13,5 @@
         }
     ],
     "@count": 4,
-    "@nextLink": "http://localhost/odata/airports?%24count=true&%24top=1&%24skip=1"
+    "@nextLink": "http://localhost/odata/airports?%24count=true&top=1&skip=1"
 }

tests/Unit/Options/__snapshots__/SkipTest__test_top_skip__1.json

@@ -12,5 +12,5 @@
             "is_big": false
         }
     ],
-    "@nextLink": "http://localhost/odata/airports?%24top=1&%24skip=2"
+    "@nextLink": "http://localhost/odata/airports?top=1&skip=2"
 }

tests/Unit/Options/__snapshots__/TopTest__test_page__1.json

@@ -22,5 +22,5 @@
             "is_big": false
         }
     ],
-    "@nextLink": "http://localhost/odata/airports?%24top=2&%24skip=2"
+    "@nextLink": "http://localhost/odata/airports?top=2&skip=2"
 }

tests/Unit/Options/__snapshots__/TopTest__test_page_select__1.json

@@ -8,5 +8,5 @@
             "code": "lax"
         }
     ],
-    "@nextLink": "http://localhost/odata/airports?%24select=code&%24top=2&%24skip=2"
+    "@nextLink": "http://localhost/odata/airports?%24select=code&top=2&skip=2"
 }

tests/Unit/Options/__snapshots__/TopTest__test_top__1.json

@@ -22,5 +22,5 @@
             "is_big": false
         }
     ],
-    "@nextLink": "http://localhost/odata/airports?%24top=2&%24skip=2"
+    "@nextLink": "http://localhost/odata/airports?top=2&skip=2"
 }

tests/Unit/Options/__snapshots__/TopTest__test_top_one__1.json

@@ -12,5 +12,5 @@
             "is_big": true
         }
     ],
-    "@nextLink": "http://localhost/odata/airports?%24top=1&%24skip=1"
+    "@nextLink": "http://localhost/odata/airports?top=1&skip=1"
 }

tests/Unit/Preferences/__snapshots__/MaxPageSizeTest__test_uses_maxpagesize_preference__1.json

@@ -9,5 +9,5 @@
             "duration": "PT11H25M0S"
         }
     ],
-    "@nextLink": "http://localhost/odata/flights?%24top=1&%24skip=1"
+    "@nextLink": "http://localhost/odata/flights?top=1&skip=1"
 }

tests/Unit/Preferences/__snapshots__/MaxPageSizeTest__test_uses_odata_maxpagesize_preference__1.json

@@ -9,5 +9,5 @@
             "duration": "PT11H25M0S"
         }
     ],
-    "@nextLink": "http://localhost/odata/flights?%24top=1&%24skip=1"
+    "@nextLink": "http://localhost/odata/flights?top=1&skip=1"
 }

tests/Unit/Protocol/ErrorReportingTest.php

@@ -41,7 +41,6 @@ public function test_error_response_body()
                 ->addInnerError('internal', 'inner error');
         } catch (NotImplementedException $e) {
             $response = $e->toResponse();
-            /** @noinspection PhpParamsInspection */
             $testResponse = new TestResponse($response);
             $this->assertMatchesSnapshot($testResponse->streamedContent(), new StreamingJsonDriver());
         }

tests/Unit/Queries/Expand/__snapshots__/ExpandTest__test_expand_containing_top__1.json

@@ -17,5 +17,5 @@
             "flight_id": 1
         }
     ],
-    "passengers@nextLink": "http://localhost/odata/flights(1)/passengers?%24top=2&%24skip=2"
+    "passengers@nextLink": "http://localhost/odata/flights(1)/passengers?top=2&skip=2"
 }

tests/Unit/Queries/Expand/__snapshots__/ExpandTest__test_expand_full_metadata_top__1.json

@@ -23,7 +23,7 @@
             ],
             "passengers@navigationLink": "http://localhost/odata/flights(1)/passengers",
             "passengers@count": 3,
-            "passengers@nextLink": "http://localhost/odata/flights(1)/passengers?%24count=true&%24top=1&%24skip=1"
+            "passengers@nextLink": "http://localhost/odata/flights(1)/passengers?%24count=true&top=1&skip=1"
         },
         {
             "@type": "#com.example.odata.flight",

tests/Unit/Queries/Expand/__snapshots__/ExpandTest__test_select_with_expand_select_multiple_and_top__1.json

@@ -11,5 +11,5 @@
             "name": "Bob Barry"
         }
     ],
-    "passengers@nextLink": "http://localhost/odata/flights(1)/passengers?%24select=flight_id%2Cname&%24top=2&%24skip=2"
+    "passengers@nextLink": "http://localhost/odata/flights(1)/passengers?%24select=flight_id%2Cname&top=2&skip=2"
 }

tests/Unit/Queries/Navigation/__snapshots__/NavigationTest__test_apply_query_parameters_to_last_segment__1.json

@@ -10,5 +10,5 @@
             "name": "Bob Barry"
         }
     ],
-    "@nextLink": "http://localhost/odata/passengers?%24select=flight_id%2Cname&%24top=2&%24skip=2"
+    "@nextLink": "http://localhost/odata/passengers?%24select=flight_id%2Cname&top=2&skip=2"
 }

tests/Unit/Redis/__snapshots__/RedisTest__test_pagination__1.json

@@ -10,5 +10,5 @@
             "key": "dqamni"
         }
     ],
-    "@nextLink": "http://localhost/odata/passengers?%24top=2&%24skiptoken=2"
+    "@nextLink": "http://localhost/odata/passengers?top=2&skiptoken=2"
 }

tests/Unit/Redis/__snapshots__/RedisTest__test_pagination__2.json

@@ -10,5 +10,5 @@
             "key": "coynla"
         }
     ],
-    "@nextLink": "http://localhost/odata/passengers?%24top=2&%24skiptoken=4"
+    "@nextLink": "http://localhost/odata/passengers?top=2&skiptoken=4"
 }

tests/Unit/Redis/__snapshots__/RedisTest__test_pagination__3.json

@@ -10,5 +10,5 @@
             "key": "ilpmuf"
         }
     ],
-    "@nextLink": "http://localhost/odata/passengers?%24top=2&%24skiptoken=6"
+    "@nextLink": "http://localhost/odata/passengers?top=2&skiptoken=6"
 }