Merge branch 'master' into uis

Author: juangabreil

src/Sdmx/api/client/SdmxClient.php

@@ -51,7 +51,7 @@ public function getCodes($codelist, $agency, $version);
      * $options = array(
      *      'startPeriod' => 'string', //Start time of the observations to be gathered
      *      'endPeriod' => 'string', //End time of the observations to be gathered
-     *      'seriesKeyOnly' => 'boolean', //Flag for disabling data and attributes processing (usually for getting the only dataflow contents)
+     *      'seriesKeysOnly' => 'boolean', //Flag for disabling data and attributes processing (usually for getting the only dataflow contents)
      *      'lastNObservations' => 'integer' //The last 'n' observations to return for each matched series.
      * )
      * ```
@@ -70,7 +70,7 @@ public function getTimeSeries(Dataflow $dataflow, DataflowStructure $dsd, $resou
      * $options = array(
      *      'startPeriod' => 'string', //Start time of the observations to be gathered
      *      'startPeriod' => 'string', //End time of the observations to be gathered
-     *      'seriesKeyOnly' => 'boolean', //Flag for disabling data and attributes processing (usually for getting the only dataflow contents)
+     *      'seriesKeysOnly' => 'boolean', //Flag for disabling data and attributes processing (usually for getting the only dataflow contents)
      *      'lastNObservations' => 'integer' //The last 'n' observations to return for each matched series.
      * )
      * ```

src/Sdmx/api/client/rest/RestSdmxClient.php

@@ -156,7 +156,7 @@ public function getCodes($codelist, $agency, $version)
      * $options = array(
      *      'startPeriod' => 'string', //Start time of the observations to be gathered
      *      'endPeriod' => 'string', //End time of the observations to be gathered
-     *      'seriesKeyOnly' => 'boolean', //Flag for disabling data and attributes processing (usually for getting the only dataflow contents)
+     *      'seriesKeysOnly' => 'boolean', //Flag for disabling data and attributes processing (usually for getting the only dataflow contents)
      *      'lastNObservations' => 'integer' //The last 'n' observations to return for each matched series.
      * )
      * ```
@@ -167,7 +167,7 @@ public function getTimeSeries(Dataflow $dataflow, DataflowStructure $dsd, $resou
         $query = $this->queryBuilder->getDataQuery($dataflow, $resource, $options);
         $response = $this->httpClient->get($query);
 
-        $containsData = array_key_exists('seriesKeyOnly', $options) ? !$options['seriesKeyOnly'] : true;
+        $containsData = array_key_exists('seriesKeysOnly', $options) ? !$options['seriesKeysOnly'] : true;
 
         return $this->dataParser->parse($response, $dsd, $dataflow->getId(), $containsData);
     }
@@ -182,7 +182,7 @@ public function getTimeSeries(Dataflow $dataflow, DataflowStructure $dsd, $resou
      * $options = array(
      *      'startPeriod' => 'string', //Start time of the observations to be gathered
      *      'endPeriod' => 'string', //End time of the observations to be gathered
-     *      'seriesKeyOnly' => 'boolean', //Flag for disabling data and attributes processing (usually for getting the only dataflow contents)
+     *      'seriesKeysOnly' => 'boolean', //Flag for disabling data and attributes processing (usually for getting the only dataflow contents)
      *      'lastNObservations' => 'integer' //The last 'n' observations to return for each matched series.
      * )
      * ```

src/Sdmx/api/client/rest/query/QueryBuilder.php

@@ -40,7 +40,7 @@ public function getCodelistQuery($codelist, $agency, $version);
      * $options = array(
      *      'startPeriod' => 'string', //Start time of the observations to be gathered
      *      'endPeriod' => 'string', //End time of the observations to be gathered
-     *      'seriesKeyOnly' => 'boolean', //Flag for disabling data and attributes processing (usually for getting the only dataflow contents)
+     *      'seriesKeysOnly' => 'boolean', //Flag for disabling data and attributes processing (usually for getting the only dataflow contents)
      *      'lastNObservations' => 'integer' //The last 'n' observations to return for each matched series.
      * )
      * ```

src/Sdmx/api/client/rest/query/SdmxV21QueryBuilder.php

@@ -71,7 +71,7 @@ public function getCodelistQuery($codelist, $agency, $version)
      * $options = array(
      *      'startPeriod' => 'string', //Start time of the observations to be gathered
      *      'endPeriod' => 'string', //End time of the observations to be gathered
-     *      'seriesKeyOnly' => 'boolean', //Flag for disabling data and attributes processing (usually for getting the only dataflow contents)
+     *      'seriesKeysOnly' => 'boolean', //Flag for disabling data and attributes processing (usually for getting the only dataflow contents)
      *      'lastNObservations' => 'integer' //The last 'n' observations to return for each matched series.
      * )
      * ```
@@ -102,9 +102,9 @@ private function prepareOptions(array $options)
             $copy[$key] = $value;
         }
 
-        if (array_key_exists('seriesKeyOnly', $copy) && $copy['seriesKeyOnly'] === true) {
-            unset($copy['seriesKeyOnly']);
-            $copy['detail'] = 'serieskeyonly';
+        if (array_key_exists('seriesKeysOnly', $copy) && $copy['seriesKeysOnly'] === true) {
+            unset($copy['seriesKeysOnly']);
+            $copy['detail'] = 'serieskeysonly';
         }
 
         return $copy;

tests/Sdmx/Tests/api/client/rest/RestSdmxClientTest.php

@@ -376,7 +376,7 @@ public function testGetTimeSeriesOnlyKeys()
         $flow->setId('EDU_REGION');
         $dsd = new DataflowStructure();
         $resource = 'a.b.c';
-        $options = ['seriesKeyOnly' => true];
+        $options = ['seriesKeysOnly' => true];
 
         $generatedQuery = 'SomeQuery';
         $this->queryBuilderMock

tests/Sdmx/Tests/api/client/rest/query/SdmxV21QueryBuilderTest.php

@@ -80,9 +80,9 @@ public function testGetDataQueryWithParams()
         $df->setId('EDU_FINANCE');
         $df->setAgency('UNESCO');
         $df->setVersion('1.0');
-        $query = $this->sdmxQueryBuilder->getDataQuery($df, 'a.b.c.d', array('startPeriod' => '2000', 'endPeriod' => '2010', 'seriesKeyOnly' => true));
+        $query = $this->sdmxQueryBuilder->getDataQuery($df, 'a.b.c.d', array('startPeriod' => '2000', 'endPeriod' => '2010', 'seriesKeysOnly' => true));
 
-        $expected = self::BASE_URL . '/data/UNESCO,EDU_FINANCE,1.0/a.b.c.d?startPeriod=2000&endPeriod=2010&detail=serieskeyonly';
+        $expected = self::BASE_URL . '/data/UNESCO,EDU_FINANCE,1.0/a.b.c.d?startPeriod=2000&endPeriod=2010&detail=serieskeysonly';
         $this->assertEquals($expected, $query);
     }
 }