Merge branch 'daleattree-master'

Author: curiosity26

README.md

@@ -58,66 +58,66 @@ myFakeFunction((string)$path);
 
 You can select which properties of the returned objects are included:
 ```PHP
-$path->select(new ODataQuerySelect(array("FirstName", "LastName")));
+$path->setSelect(new ODataQuerySelect(array("FirstName", "LastName")));
 ```
 See the Expand section below to learn how select can be applied to specific properties.
 
 <h3>$search</h3>
 
 You can search the properties of the object set using search:
 ```PHP
-$path->search(new ODataQuerySearch('mountain bike'));
+$path->setSearch(new ODataQuerySearch('mountain bike'));
 ```
 Search queries are also chainable:
 ```PHP
-$search = $path->search(); 
+$search = $path->getSearch(); 
 // operations functions are both setters and getters. When setting, the funciton returns the $path object for chainability
 $search->_and('balloon');
-$path->search($search);
+$path->setSearch($search);
 ```
 This will now search the set of Employees objects to be returned for '"mountain bike" AND balloon'. See the Expand section below to learn how the search function can be applied to specific properties.
 
 <h3>$count</h3>
 
 You can return the total record count of your query. The $count system query option ignores any $top, $skip, or $expand query options, and returns the total count of results across all pages including only those results matching any specified $filter and $search. Clients should be aware that the count returned inline may not exactly equal the actual number of items returned, due to latency between calculating the count and enumerating the last value or due to inexact calculations on the service.
 ```PHP
-$path->count();
-$path->count(FALSE); // Disables $count
+$path->getCount();
+$path->setCount(FALSE); // Disables $count
 ```
 <h3>$filter</h3>
 
 The recordset queried can be filtered to return a more precise set of records. There are various filters available and most can be used in combination with another. 
 ```PHP
 $filter = new ODataGreaterThanEqualsFilter('YearsEmployed', 6); // YearsEmployed ge 6
-$path->filter($filter);
+$path->setFilter($filter);
 ```
 Each filter has a set of extensible functions that allow the filter to be passed into another filter, returning the new filter.
 ```PHP
 $add_filter = new ODataAddFilter('YearsEmployed', 5); // YearsEmployed add 5
 $filter = $add_filter->greaterThanEquals(6); // YearsEmployed add 5 ge 6
-$path->filter($filter);
+$path->setFilter($filter);
 ```
 Filters can accept Filters as properties or values and a value can also be a property name
 ```PHP
 $sub_filter = new ODataSubtractFilter('YearsEmployed', 'YearsSebatical'); // YearsEmployed sub YearsSebatical
 $sub_filter2 = new ODataAddFilter('Awards', 'Demotions'); // Awards sub Demotions
 $filter = $sub_filter->greaterThan($sub_filter2); // (YearsEmployed sub YearsSebatical) gt (Awards sub Demotions)
-$path->filter($filter);
+$path->setFilter($filter);
 ```
 <h3>$pager</h3>
 
 Records can be paged server-side by passing $top and $skip where $top is the limit of records returned and $skip is the start offset. The ODataQueryPager object takes the math out of the equation and lets you simply specify the limit and the page you want to return.
 ```PHP
 $pager = new ODataQueryPager(20, 5); // $top=20&$skip=100
-$path->pager($pager);
+$path->setPager($pager);
 ```
 
 <h3>$orderby</h3>
 
 Results can be sorted by a property name within the collection. Simply specify which property you would like to sort by in the orderBy() function.
 
 ```PHP
-$path->orderBy('LastName');
+$path->setOrderBy('LastName');
 ```
 
 <h3>$expand</h3>

Test/ODataQueryExpandCollectionTest.php

@@ -21,13 +21,13 @@ public function testExpandWithParameter() {
         $item1 = new \ODataQuery\Expand\ODataQueryExpand('TestValue');
         $item2 = new \ODataQuery\Expand\ODataQueryExpand('Property');
 
-        $item1->limits(4)
-            ->filter(new \ODataQuery\Filter\Operators\Logical\ODataEqualsOperator('SubValue', 6))
-            ->select(new \ODataQuery\Select\ODataQuerySelect(array('SubValue', 'OtherValue')))
-            ->search(new \ODataQuery\Search\ODataQuerySearch("mountain bike"));
+        $item1->setLimits(4)
+            ->setFilter(new \ODataQuery\Filter\Operators\Logical\ODataEqualsOperator('SubValue', 6))
+            ->setSelect(new \ODataQuery\Select\ODataQuerySelect(array('SubValue', 'OtherValue')))
+            ->setSearch(new \ODataQuery\Search\ODataQuerySearch("mountain bike"));
 
-        $item2->expand(new \ODataQuery\Expand\ODataQueryExpandCollection(array($item1)))
-            ->search(new \ODataQuery\Search\ODataQuerySearch("google"));
+        $item2->setExpand(new \ODataQuery\Expand\ODataQueryExpandCollection(array($item1)))
+            ->setSearch(new \ODataQuery\Search\ODataQuerySearch("google"));
 
         $collection->add($item2);
         $this->assertEquals('Property($search=google&$expand=TestValue($select=SubValue,OtherValue&$filter=SubValue eq 6&$search="mountain bike"&$limits=4))', (string)$collection);

Test/ODataQueryPagerTest.php

@@ -10,8 +10,8 @@ class ODataQueryPagerTest extends PHPUnit_Framework_TestCase {
     public function testPager() {
         $output = new \ODataQuery\Pager\ODataQueryPager();
         $this->assertEquals('$top=500&$skip=0', (string)$output);
-        $output->limit(20);
-        $output->page(6);
+        $output->setLimit(20);
+        $output->setPage(6);
         $this->assertEquals('$top=20&$skip=120', (string)$output);
     }
 }

Test/ODataQuerySearchTest.php

@@ -10,7 +10,7 @@ class ODataQuerySearchTest extends PHPUnit_Framework_TestCase {
     public function testSearch() {
         $output = new \ODataQuery\Search\ODataQuerySearch('mountain');
         $this->assertEquals('mountain', (string)$output);
-        $output->query('mountain bike');
+        $output->setQuery('mountain bike');
         $this->assertEquals('"mountain bike"', (string)$output);
     }
 

Test/ODataResourcePathTest.php

@@ -14,39 +14,39 @@ public function testPath() {
 
     public function testSelect() {
         $output = new \ODataQuery\ODataResourcePath('api/Objects');
-        $output->select(new \ODataQuery\Select\ODataQuerySelect(array("Prop1", "Prop2")));
+        $output->setSelect(new \ODataQuery\Select\ODataQuerySelect(array("Prop1", "Prop2")));
         $this->assertEquals('api/Objects?$select=Prop1,Prop2', (string)$output);
     }
 
     public function testSearch() {
         $output = new \ODataQuery\ODataResourcePath('api/Objects');
-        $output->search(new \ODataQuery\Search\ODataQuerySearch("mountain bike"));
+        $output->setSelect(new \ODataQuery\Search\ODataQuerySearch("mountain bike"));
         $this->assertEquals('api/Objects?$search="mountain bike"', (string)$output);
     }
 
     public function testFilter() {
         $output = new \ODataQuery\ODataResourcePath('api/Objects');
-        $output->filter(new \ODataQuery\Filter\Operators\Logical\ODataEqualsOperator("TestValue", 4));
+        $output->setFilter(new \ODataQuery\Filter\Operators\Logical\ODataEqualsOperator("TestValue", 4));
         $this->assertEquals('api/Objects?$filter=TestValue eq 4', (string)$output);
     }
 
     public function testPager() {
         $output = new \ODataQuery\ODataResourcePath('api/Objects');
-        $output->pager(new \ODataQuery\Pager\ODataQueryPager(50, 4));
+        $output->setPager(new \ODataQuery\Pager\ODataQueryPager(50, 4));
         $this->assertEquals('api/Objects?$top=50&$skip=200', (string)$output);
     }
 
     public function testOrderBy() {
         $output = new \ODataQuery\ODataResourcePath('api/Objects');
-        $output->orderBy('Property');
+        $output->setOrderBy('Property');
         $this->assertEquals('api/Objects?$orderby=Property', (string)$output);
     }
 
     public function testParameters() {
         $output = new \ODataQuery\ODataResourcePath('api/Objects');
         $params = new \ODataQuery\Parameter\ODataQueryParameterCollection();
         $params->prop = 'Property';
-        $output->parameters($params);
+        $output->setParameters($params);
         $this->assertEquals('api/Objects?@prop=Property', (string)$output);
         $params->test = 'TestProperty';
         $this->assertEquals('api/Objects?@prop=Property&@test=TestProperty', (string)$output);
@@ -57,12 +57,12 @@ public function testExpand() {
         $params->prop = 'Property';
         $output = new \ODataQuery\ODataResourcePath('api/Objects');
         $expand = new \ODataQuery\Expand\ODataQueryExpand('@prop');
-        $expand->search(new \ODataQuery\Search\ODataQuerySearch("google"))
-            ->pager(new \ODataQuery\Pager\ODataQueryPager(20, 5));
+        $expand->setSearch(new \ODataQuery\Search\ODataQuerySearch("google"))
+            ->setPager(new \ODataQuery\Pager\ODataQueryPager(20, 5));
         $expand2 = new \ODataQuery\Expand\ODataQueryExpand("SubProperty", new \ODataQuery\Filter\Operators\Logical\ODataLessThanOperator("SubSubProperty", 4));
-        $expand->expand(new \ODataQuery\Expand\ODataQueryExpandCollection(array($expand2)));
-        $output->expand(new \ODataQuery\Expand\ODataQueryExpandCollection(array($expand)));
-        $output->parameters($params);
+        $expand->setExpand(new \ODataQuery\Expand\ODataQueryExpandCollection(array($expand2)));
+        $output->setExpand(new \ODataQuery\Expand\ODataQueryExpandCollection(array($expand)));
+        $output->setParameters($params);
         $this->assertEquals('api/Objects?$expand=@prop($search=google&$expand=SubProperty($filter=SubSubProperty lt 4)&$top=20&$skip=100)&@prop=Property', (string)$output);
     }
 
@@ -72,9 +72,9 @@ public function testExpand2() {
         $filter = new \ODataQuery\Filter\Operators\Logical\ODataEqualsOperator('FirstName', "'Bob'");
 
         //$query = new \ODataQuery\ODataResource();
-        $expand->filter($filter->_and(new \ODataQuery\Filter\Operators\Logical\ODataEqualsOperator('LastName',
+        $expand->setFilter($filter->_and(new \ODataQuery\Filter\Operators\Logical\ODataEqualsOperator('LastName',
             "'Jones'")));
-        $query->expand(new \ODataQuery\Expand\ODataQueryExpandCollection(array($expand)));
+        $query->setExpand(new \ODataQuery\Expand\ODataQueryExpandCollection(array($expand)));
         $this->assertEquals("api/Objects?\$expand=PrimaryContact(\$filter=(FirstName eq 'Bob') and (LastName eq 'Jones'))", (string)
         $query);
     }

composer.json

@@ -4,9 +4,8 @@
   "minimum-stability": "dev",
   "prefer-stable": true,
   "license": "GPL-2.0",
-  "version": "1.0.1",
-  "time": "2014-12-29",
-  "homepage": "http://curiosity26.github.io/ODataQuery-PHP/",
+  "version": "1.0.2",
+  "time": "2015-04-23",
   "authors": [
     {
       "name": "Alex Boyce",
@@ -15,10 +14,6 @@
       "role": "Developer"
     }
   ],
-  "dist": {
-    "url": "https://github.com/curiosity26/ODataQuery-PHP.git",
-    "type": "git"
-  },
   "support": {
     "issues": "https://github.com/curiosity26/ODataQuery-PHP/issues",
     "wiki": "https://github.com/curiosity26/ODataQuery-PHP/wiki",
@@ -32,4 +27,4 @@
   "require-dev": {
     "phpunit/phpunit": "4-stable"
   }
-}
+}

src/Expand/ODataExpandableInterface.php

@@ -10,7 +10,9 @@
 
 
 interface ODataExpandableInterface {
-    public function property($property = NULL);
-    public function limits($limits = NULL);
+    public function setProperty($property = NULL);
+    public function setLimits($limits = NULL);
+    public function getProperty();
+    public function getLimits();
     public function __toString();
 }

src/Expand/ODataQueryExpand.php

@@ -22,38 +22,52 @@ class ODataQueryExpand extends ODataResource implements ODataExpandableInterface
     public function __construct($property = NULL, ODataQueryFilterInterface $filter = NULL,
         ODataQuerySelect $select = NULL, ODataResource $expand = NULL, ODataQueryPager $pager = NULL,
         ODataQuerySearch $search = NULL, $orderBy = NULL) {
-        $this->property($property);
+        $this->setProperty($property);
         parent::__construct($filter, $select, $expand, $pager, $search, $orderBy);
     }
 
+    /**
+     * Use getter or setter
+     * Retained for backward compatibility
+     * @param null $property
+     * @return $this
+     * @deprecated
+     */
     public function property($property = NULL) {
         if (isset($property)) {
-            $this->property = $property;
+            $this->setProperty($property);
             return $this;
         }
-        return $this->property;
+        return $this->getProperty();
     }
 
+    /**
+     * Use getter or setter
+     * Retained for backward compatibility
+     * @param null $limits
+     * @return $this
+     * @deprecated
+     */
     public function limits($limits = NULL) {
         if (isset($limits)) {
             if (is_int($limits)) {
-                $this->limits = $limits;
+                $this->setLimits($limits);
                 return $this;
             }
         }
-        return $this->limits;
+        return $this->getLimits();
     }
 
     public function build() {
         $build = parent::build();
         if ($this->count !== TRUE) {
-            $build['$limits'] = $this->limits();
+            $build['$limits'] = $this->getLimits();
         }
         return array_filter($build);
     }
 
     public function __toString() {
-        $output = (string)$this->property();
+        $output = (string)$this->getProperty();
         $build = $this->build();
         $args = array();
         if (!empty($build)) {
@@ -69,4 +83,38 @@ public function __toString() {
 
         return $output;
     }
+
+    /**
+     * @return mixed
+     */
+    public function getLimits()
+    {
+        return $this->limits;
+    }
+
+    /**
+     * @param mixed $limits
+     */
+    public function setLimits($limits = NULL)
+    {
+        $this->limits = $limits;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getProperty()
+    {
+        return $this->property;
+    }
+
+    /**
+     * @param mixed $property
+     */
+    public function setProperty($property = NULL)
+    {
+        $this->property = $property;
+    }
+
+
 }

src/Expand/ODataQueryExpandCollection.php

@@ -26,13 +26,13 @@ public function __construct(array $collection = NULL) {
     }
 
     public function add(ODataQueryExpand $item) {
-        $name = (string)$item->property();
+        $name = (string)$item->getProperty();
         $this->collection[$name] = $item;
         return $this;
     }
 
     public function remove(ODataQueryExpand $item) {
-        $name = (string)$item->property();
+        $name = (string)$item->getProperty();
         unset($this->collection[$name]);
         return $this;
     }