Algo-Web / POData-Laravel

src/Controllers/ODataController.php

Spacing +3 added lines, -3 removed lines

@@ -58,9 +58,9 @@
                 $cerealRequest = serialize($request);
                 $cerealMeta = serialize($meta);
                 $cerealResponse = serialize($odataResponse);
-                Storage::put($xTest.'request', $cerealRequest);
-                Storage::put($xTest.'metadata', $cerealMeta);
-                Storage::put($xTest.'response', $cerealResponse);
+                Storage::put($xTest . 'request', $cerealRequest);
+                Storage::put($xTest . 'metadata', $cerealMeta);
+                Storage::put($xTest . 'response', $cerealResponse);
             }
         }
 

src/Providers/MetadataControllerProvider.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
                 foreach ($lock as $barrel => $roll) {
                     assert(
                         !array_key_exists($barrel, $metamix[$key]),
-                        'Mapping already defined for model '.$key.' and CRUD verb '.$barrel
+                        'Mapping already defined for model ' . $key . ' and CRUD verb ' . $barrel
                     );
                     $metamix[$key][$barrel] = $roll;
                 }

src/Query/LaravelQuery.php

Spacing +4 added lines, -4 removed lines

@@ -310,12 +310,12 @@ 
         $map = $raw->getMetadata();
 
         if (!array_key_exists($class, $map)) {
-            throw new \POData\Common\InvalidOperationException('Controller mapping missing for class '.$class.'.');
+            throw new \POData\Common\InvalidOperationException('Controller mapping missing for class ' . $class . '.');
         }
         $goal = $raw->getMapping($class, $verb);
         if (null == $goal) {
             throw new \POData\Common\InvalidOperationException(
-                'Controller mapping missing for '.$verb.' verb on class '.$class.'.'
+                'Controller mapping missing for ' . $verb . ' verb on class ' . $class . '.'
             );
         }
 
@@ -391,7 +391,7 @@ 
                 throw new ODataException($e->getMessage(), 500);
             }
         }
-        throw new ODataException('Target model not successfully '.$lastWord, 422);
+        throw new ODataException('Target model not successfully ' . $lastWord, 422);
     }
 
     /**
@@ -434,7 +434,7 @@ 
         }
         $outData = $result->getData();
         if (is_object($outData)) {
-            $outData = (array)$outData;
+            $outData = (array) $outData;
         }
 
         if (!is_array($outData)) {

src/Query/LaravelReadQuery.php

Spacing +5 added lines, -5 removed lines

@@ -135,8 +135,8 @@ 
         $nullFilter = true;
         $isvalid = null;
         if (isset($filterInfo)) {
-            $method = 'return '.$filterInfo->getExpressionAsString().';';
-            $clln = '$'.$resourceSet->getResourceType()->getName();
+            $method = 'return ' . $filterInfo->getExpressionAsString() . ';';
+            $clln = '$' . $resourceSet->getResourceType()->getName();
             $isvalid = create_function($clln, $method);
             $nullFilter = false;
         }
@@ -164,7 +164,7 @@ 
                     // so we can't bail out early
                     $rawCount += $results->count();
                     // now bolt on filtrate to accumulating result set if we haven't accumulated enough bitz
-                    if ($rawTop > $resultSet->count() + $skip) {
+                    if ($rawTop > $resultSet->count()+$skip) {
                         $resultSet = collect(array_merge($resultSet->all(), $results->all()));
                         $sliceAmount = min($skip, $resultSet->count());
                         $resultSet = $resultSet->slice($sliceAmount);
@@ -202,7 +202,7 @@ 
         if (QueryType::COUNT() == $queryType || QueryType::ENTITIES_WITH_COUNT() == $queryType) {
             $result->count = $resultCount;
         }
-        $hazMore = $bulkSetCount > $skip + count($resultSet);
+        $hazMore = $bulkSetCount > $skip+count($resultSet);
         $result->hasMore = $hazMore;
         return $result;
     }
@@ -365,7 +365,7 @@ 
         }
         $propertyName = $targetProperty->getName();
         if (!method_exists($sourceEntityInstance, $propertyName)) {
-            $msg = 'Relation method, '.$propertyName.', does not exist on supplied entity.';
+            $msg = 'Relation method, ' . $propertyName . ', does not exist on supplied entity.';
             throw new InvalidArgumentException($msg);
         }
         // take key descriptor and turn it into where clause here, rather than in getResource call

src/Query/LaravelExpressionProvider.php

Spacing +31 added lines, -31 removed lines

@@ -52,81 +52,81 @@ 
     public function __construct()
     {
         $this->functionDescriptionParsers[ODataConstants::STRFUN_COMPARE] = function ($params) {
-            return 'strcmp('.$params[0].', '.$params[1].')';
+            return 'strcmp(' . $params[0] . ', ' . $params[1] . ')';
         };
         $this->functionDescriptionParsers[ODataConstants::STRFUN_ENDSWITH] = function ($params) {
-            return '(strcmp(substr('.$params[0].', strlen('.$params[0].') - strlen('.$params[1].')), '
-                   .$params[1].') === 0)';
+            return '(strcmp(substr(' . $params[0] . ', strlen(' . $params[0] . ') - strlen(' . $params[1] . ')), '
+                   .$params[1] . ') === 0)';
         };
         $this->functionDescriptionParsers[ODataConstants::STRFUN_INDEXOF] = function ($params) {
-            return 'strpos('.$params[0].', '.$params[1].')';
+            return 'strpos(' . $params[0] . ', ' . $params[1] . ')';
         };
         $this->functionDescriptionParsers[ODataConstants::STRFUN_REPLACE] = function ($params) {
-            return 'str_replace('.$params[1].', '.$params[2].', '.$params[0].')';
+            return 'str_replace(' . $params[1] . ', ' . $params[2] . ', ' . $params[0] . ')';
         };
         $this->functionDescriptionParsers[ODataConstants::STRFUN_STARTSWITH] = function ($params) {
-            return '(strpos('.$params[0].', '.$params[1].') === 0)';
+            return '(strpos(' . $params[0] . ', ' . $params[1] . ') === 0)';
         };
         $this->functionDescriptionParsers[ODataConstants::STRFUN_TOLOWER] = function ($params) {
-            return 'strtolower('.$params[0].')';
+            return 'strtolower(' . $params[0] . ')';
         };
         $this->functionDescriptionParsers[ODataConstants::STRFUN_TOUPPER] = function ($params) {
-            return 'strtoupper('.$params[0].')';
+            return 'strtoupper(' . $params[0] . ')';
         };
         $this->functionDescriptionParsers[ODataConstants::STRFUN_TRIM] = function ($params) {
-            return 'trim('.$params[0].')';
+            return 'trim(' . $params[0] . ')';
         };
         $this->functionDescriptionParsers[ODataConstants::STRFUN_SUBSTRING] = function ($params) {
             return count($params) == 3 ?
-                'substr('.$params[0].', '.$params[1].', '.$params[2].')' : 'substr('.$params[0].', '.$params[1].')';
+                'substr(' . $params[0] . ', ' . $params[1] . ', ' . $params[2] . ')' : 'substr(' . $params[0] . ', ' . $params[1] . ')';
         };
         $this->functionDescriptionParsers[ODataConstants::STRFUN_SUBSTRINGOF] = function ($params) {
-            return '(strpos('.$params[1].', '.$params[0].') !== false)';
+            return '(strpos(' . $params[1] . ', ' . $params[0] . ') !== false)';
         };
         $this->functionDescriptionParsers[ODataConstants::STRFUN_CONCAT] = function ($params) {
-            return $params[0].' . '.$params[1];
+            return $params[0] . ' . ' . $params[1];
         };
         $this->functionDescriptionParsers[ODataConstants::STRFUN_LENGTH] = function ($params) {
-            return 'strlen('.$params[0].')';
+            return 'strlen(' . $params[0] . ')';
         };
         $this->functionDescriptionParsers[ODataConstants::GUIDFUN_EQUAL] = function ($params) {
-            return self::TYPE_NAMESPACE.'Guid::guidEqual('.$params[0].', '.$params[1].')';
+            return self::TYPE_NAMESPACE . 'Guid::guidEqual(' . $params[0] . ', ' . $params[1] . ')';
         };
         $this->functionDescriptionParsers[ODataConstants::DATETIME_COMPARE] = function ($params) {
-            return self::TYPE_NAMESPACE.'DateTime::dateTimeCmp('.$params[0].', '.$params[1].')';
+            return self::TYPE_NAMESPACE . 'DateTime::dateTimeCmp(' . $params[0] . ', ' . $params[1] . ')';
         };
         $this->functionDescriptionParsers[ODataConstants::DATETIME_YEAR] = function ($params) {
-            return self::TYPE_NAMESPACE.'DateTime::year('.$params[0].')';
+            return self::TYPE_NAMESPACE . 'DateTime::year(' . $params[0] . ')';
         };
         $this->functionDescriptionParsers[ODataConstants::DATETIME_MONTH] = function ($params) {
-            return self::TYPE_NAMESPACE.'DateTime::month('.$params[0].')';
+            return self::TYPE_NAMESPACE . 'DateTime::month(' . $params[0] . ')';
         };
         $this->functionDescriptionParsers[ODataConstants::DATETIME_DAY] = function ($params) {
-            return self::TYPE_NAMESPACE.'DateTime::day('.$params[0].')';
+            return self::TYPE_NAMESPACE . 'DateTime::day(' . $params[0] . ')';
         };
         $this->functionDescriptionParsers[ODataConstants::DATETIME_HOUR] = function ($params) {
-            return self::TYPE_NAMESPACE.'DateTime::hour('.$params[0].')';
+            return self::TYPE_NAMESPACE . 'DateTime::hour(' . $params[0] . ')';
         };
         $this->functionDescriptionParsers[ODataConstants::DATETIME_MINUTE] = function ($params) {
-            return self::TYPE_NAMESPACE.'DateTime::minute('.$params[0].')';
+            return self::TYPE_NAMESPACE . 'DateTime::minute(' . $params[0] . ')';
         };
         $this->functionDescriptionParsers[ODataConstants::DATETIME_SECOND] = function ($params) {
-            return self::TYPE_NAMESPACE.'DateTime::second('.$params[0].')';
+            return self::TYPE_NAMESPACE . 'DateTime::second(' . $params[0] . ')';
         };
         $this->functionDescriptionParsers[ODataConstants::MATHFUN_ROUND] = function ($params) {
-            return 'round('.$params[0].')';
+            return 'round(' . $params[0] . ')';
         };
         $this->functionDescriptionParsers[ODataConstants::MATHFUN_CEILING] = function ($params) {
-            return 'ceil('.$params[0].')';
+            return 'ceil(' . $params[0] . ')';
         };
         $this->functionDescriptionParsers[ODataConstants::MATHFUN_FLOOR] = function ($params) {
-            return 'floor('.$params[0].')';
+            return 'floor(' . $params[0] . ')';
         };
         $this->functionDescriptionParsers[ODataConstants::BINFUL_EQUAL] = function ($params) {
-            return self::TYPE_NAMESPACE.'Binary::binaryEqual('.$params[0].', '.$params[1].')';
+            return self::TYPE_NAMESPACE . 'Binary::binaryEqual(' . $params[0] . ', ' . $params[1] . ')';
         };
         $this->functionDescriptionParsers['is_null'] = function ($params) {
-            return 'is_null('.$params[0].')';
+            return 'is_null(' . $params[0] . ')';
         };
     }
     /**
@@ -157,7 +157,7 @@ 
      */
     public function setResourceType(ResourceType $resourceType)
     {
-        $this->iteratorName = '$'.$resourceType->getName();
+        $this->iteratorName = '$' . $resourceType->getName();
         $this->resourceType = $resourceType;
     }
     /**
@@ -282,11 +282,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;
     }
     /**
@@ -318,7 +318,7 @@ 
      */
     private function prepareBinaryExpression($operator, $left, $right)
     {
-        return self::OPEN_BRACKET.$left.' '.$operator.' '.$right.self::CLOSE_BRACKET;
+        return self::OPEN_BRACKET . $left . ' ' . $operator . ' ' . $right . self::CLOSE_BRACKET;
     }
     /**
      * To format unary expression.
@@ -330,6 +330,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/Serialisers/IronicSerialiser.php

Spacing +13 added lines, -13 removed lines

@@ -169,7 +169,7 @@ 
                 .' $propKind != ResourcePropertyKind::RESOURCE_REFERENCE'
             );
             $propTail = ResourcePropertyKind::RESOURCE_REFERENCE == $propKind ? 'entry' : 'feed';
-            $propType = 'application/atom+xml;type='.$propTail;
+            $propType = 'application/atom+xml;type=' . $propTail;
             $propName = $prop->getName();
             $nuLink->title = $propName;
             $nuLink->name = ODataConstants::ODATA_RELATED_NAMESPACE . $propName;
@@ -212,7 +212,7 @@ 
      *
      * @return ODataFeed
      */
-    public function writeTopLevelElements(QueryResult &$entryObjects)
+    public function writeTopLevelElements(QueryResult & $entryObjects)
     {
         assert(is_array($entryObjects->results), '!is_array($entryObjects->results)');
 
@@ -249,7 +249,7 @@ 
         $resourceSet = $this->getRequest()->getTargetResourceSetWrapper()->getResourceSet();
         $requestTop = $this->getRequest()->getTopOptionCount();
         $pageSize = $this->getService()->getConfiguration()->getEntitySetPageSize($resourceSet);
-        $requestTop = (null == $requestTop) ? $pageSize + 1 : $requestTop;
+        $requestTop = (null == $requestTop) ? $pageSize+1 : $requestTop;
 
         if (true === $entryObjects->hasMore && $requestTop > $pageSize) {
             $stackSegment = $setName;
@@ -332,7 +332,7 @@ 
      *
      * @return ODataPropertyContent
      */
-    public function writeTopLevelComplexObject(QueryResult &$complexValue, $propertyName, ResourceType &$resourceType)
+    public function writeTopLevelComplexObject(QueryResult & $complexValue, $propertyName, ResourceType & $resourceType)
     {
         $result = $complexValue->results;
 
@@ -361,14 +361,14 @@ 
      *                                    bag object
      * @return ODataPropertyContent
      */
-    public function writeTopLevelBagObject(QueryResult &$BagValue, $propertyName, ResourceType &$resourceType)
+    public function writeTopLevelBagObject(QueryResult & $BagValue, $propertyName, ResourceType & $resourceType)
     {
         $result = $BagValue->results;
 
         $propertyContent = new ODataPropertyContent();
         $odataProperty = new ODataProperty();
         $odataProperty->name = $propertyName;
-        $odataProperty->typeName = 'Collection('.$resourceType->getFullName().')';
+        $odataProperty->typeName = 'Collection(' . $resourceType->getFullName() . ')';
         $odataProperty->value = $this->writeBagValue($resourceType, $result);
 
         $propertyContent->properties[] = $odataProperty;
@@ -384,7 +384,7 @@ 
      *                                            primitive property to be written
      * @return ODataPropertyContent
      */
-    public function writeTopLevelPrimitive(QueryResult &$primitiveValue, ResourceProperty &$resourceProperty = null)
+    public function writeTopLevelPrimitive(QueryResult & $primitiveValue, ResourceProperty & $resourceProperty = null)
     {
         assert(null != $resourceProperty, 'Resource property must not be null');
         $propertyContent = new ODataPropertyContent();
@@ -633,7 +633,7 @@ 
         $segmentWrappers = $this->getStack()->getSegmentWrappers();
         $count = count($segmentWrappers);
 
-        return 0 == $count ? $this->getRequest()->getTargetResourceSetWrapper() : $segmentWrappers[$count - 1];
+        return 0 == $count ? $this->getRequest()->getTargetResourceSetWrapper() : $segmentWrappers[$count-1];
     }
 
     /**
@@ -658,7 +658,7 @@ 
         $skipToken = $internalOrderByInfo->buildSkipTokenValue($lastObject);
         assert(!is_null($skipToken), '!is_null($skipToken)');
         $token = (1 < $numSegments) ? '$skiptoken=' : '$skip=';
-        $skipToken = '?'.$queryParameterString.$token.$skipToken;
+        $skipToken = '?' . $queryParameterString . $token . $skipToken;
 
         return $skipToken;
     }
@@ -692,7 +692,7 @@ 
 
         $topCountValue = $this->getRequest()->getTopOptionCount();
         if (!is_null($topCountValue)) {
-            $remainingCount = $topCountValue - $this->getRequest()->getTopCount();
+            $remainingCount = $topCountValue-$this->getRequest()->getTopCount();
             if (0 < $remainingCount) {
                 if (!is_null($queryParameterString)) {
                     $queryParameterString .= '&';
@@ -727,7 +727,7 @@ 
      *
      * @return string
      */
-    private function primitiveToString(IType &$type, $primitiveValue)
+    private function primitiveToString(IType & $type, $primitiveValue)
     {
         if ($type instanceof Boolean) {
             $stringValue = (true === $primitiveValue) ? 'true' : 'false';
@@ -821,7 +821,7 @@ 
      * @param $result
      * @return ODataBagContent|null
      */
-    protected function writeBagValue(ResourceType &$resourceType, $result)
+    protected function writeBagValue(ResourceType & $resourceType, $result)
     {
         assert(null == $result || is_array($result), 'Bag parameter must be null or array');
         $typeKind = $resourceType->getResourceTypeKind();
@@ -854,7 +854,7 @@ 
      * @param string|null   $propertyName
      * @return ODataPropertyContent
      */
-    protected function writeComplexValue(ResourceType &$resourceType, &$result, $propertyName = null)
+    protected function writeComplexValue(ResourceType & $resourceType, &$result, $propertyName = null)
     {
         assert(is_object($result), 'Supplied $customObject must be an object');
 

src/Controllers/MetadataControllerTrait.php

Spacing +8 added lines, -8 removed lines

@@ -35,27 +35,27 @@ 
         assert(0 < count($this->mapping), 'Mapping array must not be empty');
 
         if (!array_key_exists($modelName, $this->mapping)) {
-            throw new \Exception('Metadata mapping for model '.$modelName.' not defined');
+            throw new \Exception('Metadata mapping for model ' . $modelName . ' not defined');
         }
 
         $this->checkCrudVerbDefined($crudVerb);
 
         $lookup = $this->mapping[$modelName];
         if (!is_array($lookup)) {
-            throw new \Exception('Metadata mapping for model '.$modelName.' not an array');
+            throw new \Exception('Metadata mapping for model ' . $modelName . ' not an array');
         }
 
         if (!array_key_exists($crudVerb, $lookup)) {
-            throw new \Exception('Metadata mapping for CRUD verb '.$crudVerb.' on model '.$modelName.' not defined');
+            throw new \Exception('Metadata mapping for CRUD verb ' . $crudVerb . ' on model ' . $modelName . ' not defined');
         }
         $result = $lookup[$crudVerb];
         if (!isset($result)) {
-            throw new \Exception('Metadata mapping for CRUD verb '.$crudVerb.' on model '.$modelName.' null');
+            throw new \Exception('Metadata mapping for CRUD verb ' . $crudVerb . ' on model ' . $modelName . ' null');
         }
 
         if (!method_exists($this, $result)) {
             throw new \Exception(
-                'Metadata target for CRUD verb '.$crudVerb.' on model '.$modelName.' does not exist'
+                'Metadata target for CRUD verb ' . $crudVerb . ' on model ' . $modelName . ' does not exist'
             );
         }
 
@@ -77,17 +77,17 @@ 
         // check that mapping array is well formed and sane, rather than waiting to stab us with a spatula
         foreach ($this->mapping as $key => $map) {
             if (!is_array($map)) {
-                throw new \Exception('Metadata mapping for model '.$key.' not an array');
+                throw new \Exception('Metadata mapping for model ' . $key . ' not an array');
             }
             foreach ($map as $verb => $method) {
                 $this->checkCrudVerbDefined($verb);
                 if (!isset($method)) {
-                    throw new \Exception('Metadata mapping for CRUD verb '.$verb.' on model '.$key.' null');
+                    throw new \Exception('Metadata mapping for CRUD verb ' . $verb . ' on model ' . $key . ' null');
                 }
 
                 if (!method_exists($this, $method)) {
                     throw new \Exception(
-                        'Metadata target for CRUD verb '.$verb.' on model '.$key.' does not exist'
+                        'Metadata target for CRUD verb ' . $verb . ' on model ' . $key . ' does not exist'
                     );
                 }
                 $parmArray = $this->getParameterNames($method);

src/Providers/MetadataProvider.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 
 class MetadataProvider extends MetadataBaseProvider
 {
-    protected $multConstraints = [ '0..1' => ['1'], '1' => ['0..1', '*'], '*' => ['1', '*']];
+    protected $multConstraints = ['0..1' => ['1'], '1' => ['0..1', '*'], '*' => ['1', '*']];
     protected static $metaNAMESPACE = 'Data';
 
     /**
@@ -191,7 +191,7 @@ 
         $knownKeys = array_keys($knownSide);
         $unknownKeys = array_keys($unknownSide);
         $dualKeys = array_intersect($knownKeys, $unknownKeys);
-        assert(count($hooks) == (count($unknownKeys) + count($knownKeys) - count($dualKeys)));
+        assert(count($hooks) == (count($unknownKeys)+count($knownKeys)-count($dualKeys)));
         // if either list is empty, bail out - there's nothing to do
         if (0 === count($knownSide) || 0 === count($unknownSide)) {
             return [];

src/Models/MetadataTrait.php

Spacing +15 added lines, -15 removed lines

@@ -284,7 +284,7 @@ 
                         $reflection = new \ReflectionMethod($model, $method);
 
                         $file = new \SplFileObject($reflection->getFileName());
-                        $file->seek($reflection->getStartLine() - 1);
+                        $file->seek($reflection->getStartLine()-1);
                         $code = '';
                         while ($file->key() < $reflection->getEndLine()) {
                             $code .= $file->current();
@@ -297,8 +297,8 @@ 
                             'Function definition must have keyword \'function\''
                         );
                         $begin = strpos($code, 'function(');
-                        $code = substr($code, $begin, strrpos($code, '}') - $begin + 1);
-                        $lastCode = $code[strlen($code) - 1];
+                        $code = substr($code, $begin, strrpos($code, '}')-$begin+1);
+                        $lastCode = $code[strlen($code)-1];
                         assert('}' == $lastCode, 'Final character of function definition must be closing brace');
                         foreach ([
                                      'hasMany',
@@ -463,7 +463,7 @@ 
                         break;
                     }
                 }
-                assert(in_array($fkMethodName, $methodList), 'Selected method, '.$fkMethodName.', not in method list');
+                assert(in_array($fkMethodName, $methodList), 'Selected method, ' . $fkMethodName . ', not in method list');
                 $rkMethodName = 'getQualifiedRelatedPivotKeyName';
                 foreach ($rkList as $option) {
                     if (in_array($option, $methodList)) {
@@ -471,7 +471,7 @@ 
                         break;
                     }
                 }
-                assert(in_array($rkMethodName, $methodList), 'Selected method, '.$rkMethodName.', not in method list');
+                assert(in_array($rkMethodName, $methodList), 'Selected method, ' . $rkMethodName . ', not in method list');
                 $line = ['fk' => $fkMethodName, 'rk' => $rkMethodName];
                 static::$methodPrimary[get_class($foo)] = $line;
             }
@@ -500,7 +500,7 @@ 
                         break;
                     }
                 }
-                assert(in_array($fkMethodName, $methodList), 'Selected method, '.$fkMethodName.', not in method list');
+                assert(in_array($fkMethodName, $methodList), 'Selected method, ' . $fkMethodName . ', not in method list');
                 $rkMethodName = 'getQualifiedParentKeyName';
                 foreach ($rkList as $option) {
                     if (in_array($option, $methodList)) {
@@ -508,7 +508,7 @@ 
                         break;
                     }
                 }
-                assert(in_array($rkMethodName, $methodList), 'Selected method, '.$rkMethodName.', not in method list');
+                assert(in_array($rkMethodName, $methodList), 'Selected method, ' . $rkMethodName . ', not in method list');
                 $line = ['fk' => $fkMethodName, 'rk' => $rkMethodName];
                 static::$methodAlternate[get_class($foo)] = $line;
             }
@@ -555,10 +555,10 @@ 
 
             $keyRaw = $isBelong ? $foo->$fkMethodName() : $foo->$fkMethodAlternate();
             $keySegments = explode('.', $keyRaw);
-            $keyName = $keySegments[count($keySegments) - 1];
+            $keyName = $keySegments[count($keySegments)-1];
             $localRaw = $isBelong ? $foo->$rkMethodName() : $foo->$rkMethodAlternate();
             $localSegments = explode('.', $localRaw);
-            $localName = $localSegments[count($localSegments) - 1];
+            $localName = $localSegments[count($localSegments)-1];
             $first = $keyName;
             $last = $localName;
             $this->addRelationsHook($hooks, $first, $property, $last, $mult, $targ);
@@ -584,10 +584,10 @@ 
 
             $keyName = $isBelong ? $foo->$fkMethodName() : $foo->$fkMethodAlternate();
             $keySegments = explode('.', $keyName);
-            $keyName = $keySegments[count($keySegments) - 1];
+            $keyName = $keySegments[count($keySegments)-1];
             $localRaw = $isBelong ? $foo->$rkMethodName() : $foo->$rkMethodAlternate();
             $localSegments = explode('.', $localRaw);
-            $localName = $localSegments[count($localSegments) - 1];
+            $localName = $localSegments[count($localSegments)-1];
             $first = $isBelong ? $localName : $keyName;
             $last = $isBelong ? $keyName : $localName;
             $this->addRelationsHook($hooks, $first, $property, $last, $mult, $targ);
@@ -611,10 +611,10 @@ 
 
             $keyRaw = $isMany ? $foo->$fkMethodName() : $foo->$fkMethodAlternate();
             $keySegments = explode('.', $keyRaw);
-            $keyName = $keySegments[count($keySegments) - 1];
+            $keyName = $keySegments[count($keySegments)-1];
             $localRaw = $isMany ? $foo->$rkMethodName() : $foo->$rkMethodAlternate();
             $localSegments = explode('.', $localRaw);
-            $localName = $localSegments[count($localSegments) - 1];
+            $localName = $localSegments[count($localSegments)-1];
             $first = $isMany ? $keyName : $localName;
             $last = $isMany ? $localName : $keyName;
             $this->addRelationsHook($hooks, $first, $property, $last, $mult, $targ);
@@ -637,10 +637,10 @@ 
 
             $keyRaw = $isMany ? $foo->$fkMethodName() : $foo->$fkMethodAlternate();
             $keySegments = explode('.', $keyRaw);
-            $keyName = $keySegments[count($keySegments) - 1];
+            $keyName = $keySegments[count($keySegments)-1];
             $localRaw = $isMany ? $foo->$rkMethodName() : $foo->$rkMethodAlternate();
             $localSegments = explode('.', $localRaw);
-            $localName = $localSegments[count($localSegments) - 1];
+            $localName = $localSegments[count($localSegments)-1];
 
             $first = $keyName;
             $last = (isset($localName) && '' != $localName) ? $localName : $foo->getRelated()->getKeyName();