Algo-Web / POData-Laravel

src/Query/LaravelExpressionProvider.php

Doc Comments -1 removed lines

@@ -45,7 +45,6 @@
      */
     private $_resourceType;
     /**
-     * @param string $iteratorName The name of the iterator
      */
     public function __construct()
     {

Indentation +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 class LaravelExpressionProvider implements IExpressionProvider
 {
-  const ADD = '+';
+    const ADD = '+';
     const CLOSE_BRACKET = ')';
     const COMMA = ',';
     const DIVIDE = '/';

Spacing +15 added lines, -15 removed lines

@@ -67,7 +67,7 @@ 
      */
     public function setResourceType(ResourceType $resourceType)
     {
-        $this->iteratorName = "$" . $resourceType->getName();
+        $this->iteratorName = "$".$resourceType->getName();
         $this->_resourceType = $resourceType;
     }
     /**
@@ -192,11 +192,11 @@ 
         $parent = $expression;
         $variable = null;
         do {
-            $variable = $parent->getResourceProperty()->getName() . self::MEMBER_ACCESS . $variable;
+            $variable = $parent->getResourceProperty()->getName().self::MEMBER_ACCESS.$variable;
             $parent = $parent->getParent();
         } while ($parent != null);
         $variable = rtrim($variable, self::MEMBER_ACCESS);
-        $variable = $this->getIteratorName() . self::MEMBER_ACCESS . $variable;
+        $variable = $this->getIteratorName().self::MEMBER_ACCESS.$variable;
         return $variable;
     }
     /**
@@ -232,25 +232,25 @@ 
             case ODataConstants::STRFUN_SUBSTRINGOF:
                 return "(strpos($params[1], $params[0]) !== false)";
             case ODataConstants::STRFUN_CONCAT:
-                return $params[0] . ' . ' . $params[1];
+                return $params[0].' . '.$params[1];
             case ODataConstants::STRFUN_LENGTH:
                 return "strlen($params[0])";
             case ODataConstants::GUIDFUN_EQUAL:
-                return self::TYPE_NAMESPACE . "Guid::guidEqual($params[0], $params[1])";
+                return self::TYPE_NAMESPACE."Guid::guidEqual($params[0], $params[1])";
             case ODataConstants::DATETIME_COMPARE:
-                return self::TYPE_NAMESPACE . "DateTime::dateTimeCmp($params[0], $params[1])";
+                return self::TYPE_NAMESPACE."DateTime::dateTimeCmp($params[0], $params[1])";
             case ODataConstants::DATETIME_YEAR:
-                return self::TYPE_NAMESPACE . "DateTime::year($params[0])";
+                return self::TYPE_NAMESPACE."DateTime::year($params[0])";
             case ODataConstants::DATETIME_MONTH:
-                return self::TYPE_NAMESPACE . "DateTime::month($params[0])";
+                return self::TYPE_NAMESPACE."DateTime::month($params[0])";
             case ODataConstants::DATETIME_DAY:
-                return self::TYPE_NAMESPACE . "DateTime::day($params[0])";
+                return self::TYPE_NAMESPACE."DateTime::day($params[0])";
             case ODataConstants::DATETIME_HOUR:
-                return self::TYPE_NAMESPACE . "DateTime::hour($params[0])";
+                return self::TYPE_NAMESPACE."DateTime::hour($params[0])";
             case ODataConstants::DATETIME_MINUTE:
-                return self::TYPE_NAMESPACE . "DateTime::minute($params[0])";
+                return self::TYPE_NAMESPACE."DateTime::minute($params[0])";
             case ODataConstants::DATETIME_SECOND:
-                return self::TYPE_NAMESPACE . "DateTime::second($params[0])";
+                return self::TYPE_NAMESPACE."DateTime::second($params[0])";
             case ODataConstants::MATHFUN_ROUND:
                 return "round($params[0])";
             case ODataConstants::MATHFUN_CEILING:
@@ -258,7 +258,7 @@ 
             case ODataConstants::MATHFUN_FLOOR:
                 return "floor($params[0])";
             case ODataConstants::BINFUL_EQUAL:
-                return self::TYPE_NAMESPACE . "Binary::binaryEqual($params[0], $params[1])";
+                return self::TYPE_NAMESPACE."Binary::binaryEqual($params[0], $params[1])";
             case 'is_null':
                 return "is_null($params[0])";
             default:
@@ -277,7 +277,7 @@ 
     private function _prepareBinaryExpression($operator, $left, $right)
     {
         return
-            self::OPEN_BRACKET . $left . ' ' . $operator . ' ' . $right . self::CLOSE_BRACKET;
+            self::OPEN_BRACKET.$left.' '.$operator.' '.$right.self::CLOSE_BRACKET;
     }
     /**
      * To format unary expression.
@@ -289,6 +289,6 @@ 
      */
     private function _prepareUnaryExpression($operator, $child)
     {
-        return $operator . self::OPEN_BRACKET . $child . self::CLOSE_BRACKET;
+        return $operator.self::OPEN_BRACKET.$child.self::CLOSE_BRACKET;
     }
 }

src/Query/LaravelQuery.php

Doc Comments +2 added lines

@@ -147,6 +147,8 @@
 
     /**
      * Common method for getResourceFromRelatedResourceSet() and getResourceFromResourceSet()
+     * @param ResourceSet|null $resourceSet
+     * @param null|KeyDescriptor $keyDescriptor
      */
     protected function getResource(
         $resourceSet,

Unused Use Statements -2 removed lines

@@ -6,7 +6,6 @@ 
 use POData\Providers\Metadata\ResourceSet;
 use POData\UriProcessor\QueryProcessor\Expression\Parser\IExpressionProvider;
 use POData\UriProcessor\QueryProcessor\ExpressionParser\FilterInfo;
-use POData\UriProcessor\QueryProcessor\OrderByParser\InternalOrderByInfo;
 use POData\UriProcessor\ResourcePathProcessor\SegmentParser\KeyDescriptor;
 use POData\Providers\Query\IQueryProvider;
 use POData\Providers\Expression\MySQLExpressionProvider;
@@ -14,7 +13,6 @@ 
 use POData\Providers\Query\QueryResult;
 use POData\Providers\Expression\PHPExpressionProvider;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Database\Eloquent\Model as Model;
 
 class LaravelQuery implements IQueryProvider
 {

Spacing +4 added lines, -4 removed lines

@@ -106,10 +106,10 @@
 
         $resultSet = $sourceEntityInstance->get();
 
-        if(isset($filterInfo)){
-            $method = "return " .  $filterInfo->getExpressionAsString() . ";";
-            $clln = "$" . $resourceSet->getResourceType()->getName();
-            $isvalid = create_function($clln,$method );
+        if (isset($filterInfo)) {
+            $method = "return ".$filterInfo->getExpressionAsString().";";
+            $clln = "$".$resourceSet->getResourceType()->getName();
+            $isvalid = create_function($clln, $method);
             $resultSet = $resultSet->filter($isvalid);
         }