Algo-Web / POData

src/POData/Writers/Atom/AtomODataWriter.php

Braces +2 added lines, -1 removed lines

@@ -570,7 +570,8 @@
                 );
                 $this->writeProperties($content);
                 $this->xmlWriter->endElement();
-            } else {  //probably just a primitive string
+            } else {
+//probably just a primitive string
                     $this->xmlWriter->startElementNs(
                         ODataConstants::ODATA_NAMESPACE_PREFIX,
                         ODataConstants::COLLECTION_ELEMENT_NAME,

src/POData/Common/Url.php

Braces +2 added lines, -1 removed lines

@@ -28,7 +28,8 @@
                 throw new UrlFormatException(Messages::urlMalformedUrl($url));
             }
         } else {
-            if (!preg_match(self::REL_URL_REGEXP, $url)) { //TODO: this matches EVERYTHING!!! what's the intent here? see #77
+            if (!preg_match(self::REL_URL_REGEXP, $url)) {
+//TODO: this matches EVERYTHING!!! what's the intent here? see #77
                 throw new UrlFormatException(Messages::urlMalformedUrl($url));
             }
         }

src/POData/UriProcessor/UriProcessor.php

Spacing +1 added lines, -1 removed lines

@@ -397,7 +397,7 @@
                     //TODO: why are these null?  see #98
                     null, // $orderby
                     null, // $top
-                    null,  // $skip
+                    null, // $skip
                     $skipToken
                 );
 

src/POData/UriProcessor/ResourcePathProcessor/SegmentParser/KeyDescriptor.php

Spacing +1 added lines, -1 removed lines

@@ -203,7 +203,7 @@
      */
     public static function tryParseKeysFromKeyPredicate(
         $keyPredicate,
-        KeyDescriptor &$keyDescriptor = null
+        KeyDescriptor & $keyDescriptor = null
     ) {
         return self::tryParseKeysFromRawKeyPredicate(
             $keyPredicate,

src/POData/Providers/Expression/PHPExpressionProvider.php

Indentation +1 added lines, -1 removed lines

@@ -262,7 +262,7 @@
 
             case ODataConstants::STRFUN_ENDSWITH:
                 return '(strcmp(substr('.$params[0].', strlen('.$params[0].') - strlen('.$params[1].')), '
-                       .$params[1].') === 0)';
+                        .$params[1].') === 0)';
 
             case ODataConstants::STRFUN_INDEXOF:
                 return 'strpos('.$params[0].', '.$params[1].')';

Spacing +25 added lines, -25 removed lines

@@ -258,81 +258,81 @@
     {
         switch ($functionDescription->name) {
             case ODataConstants::STRFUN_COMPARE:
-                return 'strcmp('.$params[0].', '.$params[1].')';
+                return 'strcmp(' . $params[0] . ', ' . $params[1] . ')';
 
             case ODataConstants::STRFUN_ENDSWITH:
-                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)';
 
             case ODataConstants::STRFUN_INDEXOF:
-                return 'strpos('.$params[0].', '.$params[1].')';
+                return 'strpos(' . $params[0] . ', ' . $params[1] . ')';
 
             case ODataConstants::STRFUN_REPLACE:
-                return 'str_replace('.$params[1].', '.$params[2].', '.$params[0].')';
+                return 'str_replace(' . $params[1] . ', ' . $params[2] . ', ' . $params[0] . ')';
 
             case ODataConstants::STRFUN_STARTSWITH:
-                return '(strpos('.$params[0].', '.$params[1].') === 0)';
+                return '(strpos(' . $params[0] . ', ' . $params[1] . ') === 0)';
 
             case ODataConstants::STRFUN_TOLOWER:
-                return 'strtolower('.$params[0].')';
+                return 'strtolower(' . $params[0] . ')';
 
             case ODataConstants::STRFUN_TOUPPER:
-                return 'strtoupper('.$params[0].')';
+                return 'strtoupper(' . $params[0] . ')';
 
             case ODataConstants::STRFUN_TRIM:
-                return 'trim('.$params[0].')';
+                return 'trim(' . $params[0] . ')';
 
             case ODataConstants::STRFUN_SUBSTRING:
                 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] . ')';
 
             case ODataConstants::STRFUN_SUBSTRINGOF:
-                return '(strpos('.$params[1].', '.$params[0].') !== false)';
+                return '(strpos(' . $params[1] . ', ' . $params[0] . ') !== false)';
 
             case ODataConstants::STRFUN_CONCAT:
                 return $params[0] . ' . ' . $params[1];
 
             case ODataConstants::STRFUN_LENGTH:
-                return 'strlen('.$params[0].')';
+                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].')';
+                return 'round(' . $params[0] . ')';
 
             case ODataConstants::MATHFUN_CEILING:
-                return 'ceil('.$params[0].')';
+                return 'ceil(' . $params[0] . ')';
 
             case ODataConstants::MATHFUN_FLOOR:
-                return 'floor('.$params[0].')';
+                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].')';
+                return 'is_null(' . $params[0] . ')';
 
             default:
                 throw new \InvalidArgumentException('onFunctionCallExpression');

src/POData/Providers/Expression/MySQLExpressionProvider.php

Spacing +20 added lines, -20 removed lines

@@ -249,48 +249,48 @@ 
     {
         switch ($functionDescription->name) {
             case ODataConstants::STRFUN_COMPARE:
-                return 'STRCMP('.$params[0].', '.$params[1].')';
+                return 'STRCMP(' . $params[0] . ', ' . $params[1] . ')';
 
             case ODataConstants::STRFUN_ENDSWITH:
-                return '(STRCMP('.$params[1].',RIGHT('.$params[0].',LENGTH('.$params[1].'))) = 0)';
+                return '(STRCMP(' . $params[1] . ',RIGHT(' . $params[0] . ',LENGTH(' . $params[1] . '))) = 0)';
 
             case ODataConstants::STRFUN_INDEXOF:
-                return 'INSTR('.$params[0].', '.$params[1].') - 1';
+                return 'INSTR(' . $params[0] . ', ' . $params[1] . ') - 1';
 
             case ODataConstants::STRFUN_REPLACE:
-                return 'REPLACE('.$params[0].','.$params[1].','.$params[2].')';
+                return 'REPLACE(' . $params[0] . ',' . $params[1] . ',' . $params[2] . ')';
 
             case ODataConstants::STRFUN_STARTSWITH:
-                return '(STRCMP('.$params[1].',LEFT('.$params[0].',LENGTH('.$params[1].'))) = 0)';
+                return '(STRCMP(' . $params[1] . ',LEFT(' . $params[0] . ',LENGTH(' . $params[1] . '))) = 0)';
 
             case ODataConstants::STRFUN_TOLOWER:
-                return 'LOWER('.$params[0].')';
+                return 'LOWER(' . $params[0] . ')';
 
             case ODataConstants::STRFUN_TOUPPER:
-                return 'UPPER('.$params[0].')';
+                return 'UPPER(' . $params[0] . ')';
 
             case ODataConstants::STRFUN_TRIM:
-                return 'TRIM('.$params[0].')';
+                return 'TRIM(' . $params[0] . ')';
 
             case ODataConstants::STRFUN_SUBSTRING:
                 return count($params) == 3 ?
-                    'SUBSTRING('.$params[0].', '.$params[1].' + 1, '.$params[2].')'
-                    : 'SUBSTRING('.$params[0].', '.$params[1].' + 1)';
+                    'SUBSTRING(' . $params[0] . ', ' . $params[1] . ' + 1, ' . $params[2] . ')'
+                    : 'SUBSTRING(' . $params[0] . ', ' . $params[1] . ' + 1)';
 
             case ODataConstants::STRFUN_SUBSTRINGOF:
-                return '(LOCATE('.$params[0].', '.$params[1].') > 0)';
+                return '(LOCATE(' . $params[0] . ', ' . $params[1] . ') > 0)';
 
             case ODataConstants::STRFUN_CONCAT:
-                return 'CONCAT('.$params[0].','.$params[1].')';
+                return 'CONCAT(' . $params[0] . ',' . $params[1] . ')';
 
             case ODataConstants::STRFUN_LENGTH:
-                return 'LENGTH('.$params[0].')';
+                return 'LENGTH(' . $params[0] . ')';
 
             case ODataConstants::GUIDFUN_EQUAL:
-                return 'STRCMP('.$params[0].', '.$params[1].')';
+                return 'STRCMP(' . $params[0] . ', ' . $params[1] . ')';
 
             case ODataConstants::DATETIME_COMPARE:
-                return 'DATETIMECMP('.$params[0].'; '.$params[1].')';
+                return 'DATETIMECMP(' . $params[0] . '; ' . $params[1] . ')';
 
             case ODataConstants::DATETIME_YEAR:
                 return 'EXTRACT(YEAR from ' . $params[0] . ')';
@@ -311,19 +311,19 @@ 
                 return 'EXTRACT(SECOND from ' . $params[0] . ')';
 
             case ODataConstants::MATHFUN_ROUND:
-                return 'ROUND('.$params[0].')';
+                return 'ROUND(' . $params[0] . ')';
 
             case ODataConstants::MATHFUN_CEILING:
-                return 'CEIL('.$params[0].')';
+                return 'CEIL(' . $params[0] . ')';
 
             case ODataConstants::MATHFUN_FLOOR:
-                return 'FLOOR('.$params[0].')';
+                return 'FLOOR(' . $params[0] . ')';
 
             case ODataConstants::BINFUL_EQUAL:
-                return '('.$params[0].' = '.$params[1].')';
+                return '(' . $params[0] . ' = ' . $params[1] . ')';
 
             case 'is_null':
-                return 'is_null('.$params[0].')';
+                return 'is_null(' . $params[0] . ')';
 
             default:
                 throw new \InvalidArgumentException('onFunctionCallExpression');

src/POData/Common/Messages/metadataAssociationType.php

Indentation +6 added lines, -6 removed lines

@@ -15,7 +15,7 @@ 
     public static function metadataAssociationTypeSetBidirectionalAssociationMustReturnSameResourceAssociationSetFromBothEnd()
     {
         return 'When the ResourceAssociationSet is bidirectional, IMetadataProvider::getResourceAssociationSet() must'.
-               ' return the same ResourceAssociationSet when call from both ends.';
+                ' return the same ResourceAssociationSet when call from both ends.';
     }
 
     /**
@@ -32,10 +32,10 @@ 
     public static function metadataAssociationTypeSetMultipleAssociationSetsForTheSameAssociationTypeMustNotReferToSameEndSets($resourceSet1Name, $resourceSet2Name, $entitySetName)
     {
         return 'ResourceAssociationSets \''.$resourceSet1Name.'\' and \''.$resourceSet2Name.'\' have a'
-               .' ResourceAssociationSetEnd referring to the same EntitySet \''.$entitySetName.'\' through the same'
-               .' AssociationType. Make sure that if two or more AssociationSets refer to the same AssociationType,'
-               .' the ends must not refer to the same EntitySet. (this could happen if multiple entity sets have'
-               .' entity types that have a common ancestor and the ancestor has a property of derived entity types)';
+                .' ResourceAssociationSetEnd referring to the same EntitySet \''.$entitySetName.'\' through the same'
+                .' AssociationType. Make sure that if two or more AssociationSets refer to the same AssociationType,'
+                .' the ends must not refer to the same EntitySet. (this could happen if multiple entity sets have'
+                .' entity types that have a common ancestor and the ancestor has a property of derived entity types)';
     }
 
     /**
@@ -49,6 +49,6 @@ 
     public static function metadataAssociationTypeSetInvalidGetDerivedTypesReturnType($resourceTypeName)
     {
         return 'Return type of IDSMP::getDerivedTypes should be either null or array of \'ResourceType\', check'
-               .' implementation of IDSMP::getDerivedTypes for the resource type \''.$resourceTypeName.'\'.';
+                .' implementation of IDSMP::getDerivedTypes for the resource type \''.$resourceTypeName.'\'.';
     }
 }

Spacing +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
      */
     public static function metadataAssociationTypeSetBidirectionalAssociationMustReturnSameResourceAssociationSetFromBothEnd()
     {
-        return 'When the ResourceAssociationSet is bidirectional, IMetadataProvider::getResourceAssociationSet() must'.
+        return 'When the ResourceAssociationSet is bidirectional, IMetadataProvider::getResourceAssociationSet() must' .
                ' return the same ResourceAssociationSet when call from both ends.';
     }
 
@@ -31,8 +31,8 @@ 
      */
     public static function metadataAssociationTypeSetMultipleAssociationSetsForTheSameAssociationTypeMustNotReferToSameEndSets($resourceSet1Name, $resourceSet2Name, $entitySetName)
     {
-        return 'ResourceAssociationSets \''.$resourceSet1Name.'\' and \''.$resourceSet2Name.'\' have a'
-               .' ResourceAssociationSetEnd referring to the same EntitySet \''.$entitySetName.'\' through the same'
+        return 'ResourceAssociationSets \'' . $resourceSet1Name . '\' and \'' . $resourceSet2Name . '\' have a'
+               .' ResourceAssociationSetEnd referring to the same EntitySet \'' . $entitySetName . '\' through the same'
                .' AssociationType. Make sure that if two or more AssociationSets refer to the same AssociationType,'
                .' the ends must not refer to the same EntitySet. (this could happen if multiple entity sets have'
                .' entity types that have a common ancestor and the ancestor has a property of derived entity types)';
@@ -49,6 +49,6 @@ 
     public static function metadataAssociationTypeSetInvalidGetDerivedTypesReturnType($resourceTypeName)
     {
         return 'Return type of IDSMP::getDerivedTypes should be either null or array of \'ResourceType\', check'
-               .' implementation of IDSMP::getDerivedTypes for the resource type \''.$resourceTypeName.'\'.';
+               .' implementation of IDSMP::getDerivedTypes for the resource type \'' . $resourceTypeName . '\'.';
     }
 }

src/POData/Common/Messages/queryProvider.php

Indentation +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
     public static function queryProviderResultCountMissing($methodName, QueryType $queryType)
     {
         return 'The implementation of the method '.$methodName.' must return a QueryResult instance with a count for '
-               .'queries of type '.$queryType.'.';
+                .'queries of type '.$queryType.'.';
     }
 
     /**
@@ -37,6 +37,6 @@ 
     public static function queryProviderResultsMissing($methodName, QueryType $queryType)
     {
         return 'The implementation of the method '.$methodName.' must return a QueryResult instance with an array'
-               .' of results for queries of type '.$queryType.'.';
+                .' of results for queries of type '.$queryType.'.';
     }
 }

Spacing +5 added lines, -5 removed lines

@@ -13,7 +13,7 @@ 
      */
     public static function queryProviderReturnsNonQueryResult($methodName)
     {
-        return 'The implementation of the method '.$methodName.' must return a QueryResult instance.';
+        return 'The implementation of the method ' . $methodName . ' must return a QueryResult instance.';
     }
 
     /**
@@ -24,8 +24,8 @@ 
      */
     public static function queryProviderResultCountMissing($methodName, QueryType $queryType)
     {
-        return 'The implementation of the method '.$methodName.' must return a QueryResult instance with a count for '
-               .'queries of type '.$queryType.'.';
+        return 'The implementation of the method ' . $methodName . ' must return a QueryResult instance with a count for '
+               .'queries of type ' . $queryType . '.';
     }
 
     /**
@@ -36,7 +36,7 @@ 
      */
     public static function queryProviderResultsMissing($methodName, QueryType $queryType)
     {
-        return 'The implementation of the method '.$methodName.' must return a QueryResult instance with an array'
-               .' of results for queries of type '.$queryType.'.';
+        return 'The implementation of the method ' . $methodName . ' must return a QueryResult instance with an array'
+               .' of results for queries of type ' . $queryType . '.';
     }
 }

src/POData/Common/Messages/objectModelSerializer.php

Indentation +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
     public static function badQueryNullKeysAreNotSupported($resourceTypeName, $keyName)
     {
         return 'The serialized resource of type '.$resourceTypeName.' has a null value in key member \''.$keyName
-               .'\'. Null values are not supported in key members.';
+                .'\'. Null values are not supported in key members.';
     }
 
     /**
@@ -46,7 +46,7 @@ 
     public static function objectModelSerializerFailedToAccessProperty($propertyName, $parentObjectName)
     {
         return 'objectModelSerializer failed to access or initialize the property '.$propertyName.' of '
-               .$parentObjectName.', Please contact provider.';
+                .$parentObjectName.', Please contact provider.';
     }
 
     /**
@@ -60,6 +60,6 @@ 
     public static function objectModelSerializerLoopsNotAllowedInComplexTypes($complexPropertyName)
     {
         return 'A circular loop was detected while serializing the property \'' . $complexPropertyName
-               . '\'. You must make sure that loops are not present in properties that return a bag or complex type.';
+                . '\'. You must make sure that loops are not present in properties that return a bag or complex type.';
     }
 }

Spacing +4 added lines, -4 removed lines

@@ -15,7 +15,7 @@ 
      */
     public static function badProviderInconsistentEntityOrComplexTypeUsage($typeName)
     {
-        return 'Internal Server Error. The type \''.$typeName.'\' has inconsistent metadata and runtime type info.';
+        return 'Internal Server Error. The type \'' . $typeName . '\' has inconsistent metadata and runtime type info.';
     }
 
     /**
@@ -30,7 +30,7 @@ 
      */
     public static function badQueryNullKeysAreNotSupported($resourceTypeName, $keyName)
     {
-        return 'The serialized resource of type '.$resourceTypeName.' has a null value in key member \''.$keyName
+        return 'The serialized resource of type ' . $resourceTypeName . ' has a null value in key member \'' . $keyName
                .'\'. Null values are not supported in key members.';
     }
 
@@ -45,8 +45,8 @@ 
      */
     public static function objectModelSerializerFailedToAccessProperty($propertyName, $parentObjectName)
     {
-        return 'objectModelSerializer failed to access or initialize the property '.$propertyName.' of '
-               .$parentObjectName.', Please contact provider.';
+        return 'objectModelSerializer failed to access or initialize the property ' . $propertyName . ' of '
+               .$parentObjectName . ', Please contact provider.';
     }
 
     /**