Algo-Web / POData

src/POData/UriProcessor/UriProcessor.php

Spacing +2 added lines, -2 removed lines

@@ -208,7 +208,7 @@ 
      */
     protected function executePut()
     {
-        return $this->executeBase(function ($uriProcessor, $segment) {
+        return $this->executeBase(function($uriProcessor, $segment) {
             $requestMethod = $uriProcessor->getService()->getOperationContext()->incomingRequest()->getMethod();
             $resourceSet = $segment->getTargetResourceSetWrapper();
             $keyDescriptor = $segment->getKeyDescriptor();
@@ -231,7 +231,7 @@ 
      */
     protected function executeDelete()
     {
-        return $this->executeBase(function ($uriProcessor, $segment) {
+        return $this->executeBase(function($uriProcessor, $segment) {
             $requestMethod = $uriProcessor->getService()->getOperationContext()->incomingRequest()->getMethod();
             $resourceSet = $segment->getTargetResourceSetWrapper();
             $keyDescriptor = $segment->getKeyDescriptor();

src/POData/ObjectModel/ObjectModelSerializer.php

Doc Comments +4 added lines, -4 removed lines

@@ -769,9 +769,9 @@ 
     /**
      * @param $customObject
      * @param ResourceType $resourceType
-     * @param $relativeUri
+     * @param string $relativeUri
      * @param ODataPropertyContent $odataPropertyContent
-     * @param $resourceTypeKind
+     * @param ResourceTypeKind $resourceTypeKind
      * @param $navigationProperties
      *
      * @throws ODataException
@@ -881,9 +881,9 @@ 
     /**
      * @param $customObject
      * @param ResourceType $resourceType
-     * @param $relativeUri
+     * @param string $relativeUri
      * @param ODataPropertyContent $odataPropertyContent
-     * @param $projectionNodes
+     * @param \POData\UriProcessor\QueryProcessor\ExpandProjectionParser\ProjectionNode[] $projectionNodes
      * @param $navigationProperties
      *
      * @throws ODataException

Spacing +33 added lines, -33 removed lines

@@ -132,7 +132,7 @@ 
                 $this->getCurrentResourceSetWrapper()->getName()
             );
 
-            $url->url = rtrim($this->absoluteServiceUri, '/').'/'.$relativeUri;
+            $url->url = rtrim($this->absoluteServiceUri, '/') . '/' . $relativeUri;
         }
 
         return $url;
@@ -186,7 +186,7 @@ 
     public function writeTopLevelComplexObject(
         &$complexValue,
         $propertyName,
-        ResourceType &$resourceType
+        ResourceType & $resourceType
     ) {
         $propertyContent = new ODataPropertyContent();
         $this->_writeComplexValue(
@@ -215,7 +215,7 @@ 
     public function writeTopLevelBagObject(
         &$BagValue,
         $propertyName,
-        ResourceType &$resourceType
+        ResourceType & $resourceType
     ) {
         $propertyContent = new ODataPropertyContent();
         $this->_writeBagValue(
@@ -243,7 +243,7 @@ 
      */
     public function writeTopLevelPrimitive(
         &$primitiveValue,
-        ResourceProperty &$resourceProperty
+        ResourceProperty & $resourceProperty
     ) {
         $propertyContent = new ODataPropertyContent();
         $propertyContent->properties[] = new ODataProperty();
@@ -285,7 +285,7 @@ 
                 $this->getCurrentResourceSetWrapper()->getName()
             );
 
-            $absoluteUri = rtrim($this->absoluteServiceUri, '/').'/'.$relativeUri;
+            $absoluteUri = rtrim($this->absoluteServiceUri, '/') . '/' . $relativeUri;
             $title = $resourceType->getName();
             //TODO Resolve actual resource type
             $actualResourceType = $resourceType;
@@ -330,11 +330,11 @@ 
      */
     private function _writeFeedElements(
         &$entryObjects,
-        ResourceType &$resourceType,
+        ResourceType & $resourceType,
         $title,
         $absoluteUri,
         $relativeUri,
-        ODataFeed &$feed
+        ODataFeed & $feed
     ) {
         assert(is_array($entryObjects), '!_writeFeedElements::is_array($entryObjects)');
         $feed->id = $absoluteUri;
@@ -384,11 +384,11 @@ 
      */
     private function _writeObjectProperties(
         $customObject,
-        ResourceType &$resourceType,
+        ResourceType & $resourceType,
         $absoluteUri,
         $relativeUri,
         &$odataEntry,
-        ODataPropertyContent &$odataPropertyContent
+        ODataPropertyContent & $odataPropertyContent
     ) {
         $resourceTypeKind = $resourceType->getResourceTypeKind();
         if (is_null($absoluteUri) == ($resourceTypeKind == ResourceTypeKind::ENTITY)
@@ -440,14 +440,14 @@ 
                 $type = $navigationPropertyInfo->resourceProperty->getKind() == ResourcePropertyKind::RESOURCE_REFERENCE ?
                     'application/atom+xml;type=entry' : 'application/atom+xml;type=feed';
                 $link = new ODataLink();
-                $link->name = ODataConstants::ODATA_RELATED_NAMESPACE.$propertyName;
+                $link->name = ODataConstants::ODATA_RELATED_NAMESPACE . $propertyName;
                 $link->title = $propertyName;
                 $link->type = $type;
-                $link->url = $relativeUri.'/'.$propertyName;
+                $link->url = $relativeUri . '/' . $propertyName;
 
                 if ($navigationPropertyInfo->expanded) {
-                    $propertyRelativeUri = $relativeUri.'/'.$propertyName;
-                    $propertyAbsoluteUri = trim($absoluteUri, '/').'/'.$propertyName;
+                    $propertyRelativeUri = $relativeUri . '/' . $propertyName;
+                    $propertyAbsoluteUri = trim($absoluteUri, '/') . '/' . $propertyName;
                     $needPop = $this->pushSegmentForNavigationProperty($navigationPropertyInfo->resourceProperty);
                     $navigationPropertyKind = $navigationPropertyInfo->resourceProperty->getKind();
                     assert(
@@ -510,8 +510,8 @@ 
      */
     private function _writePrimitiveValue(
         &$primitiveValue,
-        ResourceProperty &$resourceProperty,
-        ODataProperty &$odataProperty
+        ResourceProperty & $resourceProperty,
+        ODataProperty & $odataProperty
     ) {
         if (is_object($primitiveValue)) {
             //TODO ERROR: The property 'PropertyName'
@@ -545,9 +545,9 @@ 
     private function _writeComplexValue(
         &$complexValue,
         $propertyName,
-        ResourceType &$resourceType,
+        ResourceType & $resourceType,
         $relativeUri,
-        ODataPropertyContent &$odataPropertyContent
+        ODataPropertyContent & $odataPropertyContent
     ) {
         $odataProperty = new ODataProperty();
         $odataProperty->name = $propertyName;
@@ -586,9 +586,9 @@ 
     private function _writeBagValue(
         &$BagValue,
         $propertyName,
-        ResourceType &$resourceType,
+        ResourceType & $resourceType,
         $relativeUri,
-        ODataPropertyContent &$odataPropertyContent
+        ODataPropertyContent & $odataPropertyContent
     ) {
         assert(null == $BagValue || is_array($BagValue), 'Bag parameter must be null or array');
         $bagItemResourceTypeKind = $resourceType->getResourceTypeKind();
@@ -601,7 +601,7 @@ 
 
         $odataProperty = new ODataProperty();
         $odataProperty->name = $propertyName;
-        $odataProperty->typeName = 'Collection('.$resourceType->getFullName().')';
+        $odataProperty->typeName = 'Collection(' . $resourceType->getFullName() . ')';
 
         if (is_null($BagValue) || (is_array($BagValue) && empty($BagValue))) {
             $odataProperty->value = null;
@@ -645,10 +645,10 @@ 
      */
     private function _writeMediaResourceMetadata(
         $entryObject,
-        ResourceType &$resourceType,
+        ResourceType & $resourceType,
         $title,
         $relativeUri,
-        ODataEntry &$odataEntry
+        ODataEntry & $odataEntry
     ) {
         if ($resourceType->isMediaLinkEntry()) {
             $odataEntry->isMediaLinkEntry = true;
@@ -696,7 +696,7 @@ 
      * @return string
      */
     private function _primitiveToString(
-        ResourceType &$primitiveResourceType,
+        ResourceType & $primitiveResourceType,
         $primitiveValue
     ) {
         $type = $primitiveResourceType->getInstanceType();
@@ -735,9 +735,9 @@ 
     private function _complexObjectToContent(
         &$complexValue,
         $propertyName,
-        ResourceType &$resourceType,
+        ResourceType & $resourceType,
         $relativeUri,
-        ODataPropertyContent &$odataPropertyContent
+        ODataPropertyContent & $odataPropertyContent
     ) {
         $count = count($this->complexTypeInstanceCollection);
         for ($i = 0; $i < $count; ++$i) {
@@ -780,9 +780,9 @@ 
      */
     private function writeObjectPropertiesUnexpanded(
         $customObject,
-        ResourceType &$resourceType,
+        ResourceType & $resourceType,
         $relativeUri,
-        ODataPropertyContent &$odataPropertyContent,
+        ODataPropertyContent & $odataPropertyContent,
         $resourceTypeKind,
         $navigationProperties
     ) {
@@ -832,7 +832,7 @@ 
                     $propertyValue,
                     $resourceProperty->getName(),
                     $resourceType2,
-                    $relativeUri.'/'.$resourceProperty->getName(),
+                    $relativeUri . '/' . $resourceProperty->getName(),
                     $odataPropertyContent
                 );
             } else {
@@ -844,7 +844,7 @@ 
                         $propertyValue,
                         $resourceProperty->getName(),
                         $resourceType1,
-                        $relativeUri.'/'.$resourceProperty->getName(),
+                        $relativeUri . '/' . $resourceProperty->getName(),
                         $odataPropertyContent
                     );
                 } elseif ($resourceKind == ResourcePropertyKind::PRIMITIVE
@@ -892,9 +892,9 @@ 
      */
     private function writeObjectPropertiesExpanded(
         $customObject,
-        ResourceType &$resourceType,
+        ResourceType & $resourceType,
         $relativeUri,
-        ODataPropertyContent &$odataPropertyContent,
+        ODataPropertyContent & $odataPropertyContent,
         $projectionNodes,
         $navigationProperties
     ) {
@@ -942,7 +942,7 @@ 
                     $propertyValue,
                     $propertyName,
                     $bagResourceType,
-                    $relativeUri.'/'.$propertyName,
+                    $relativeUri . '/' . $propertyName,
                     $odataPropertyContent
                 );
             } elseif ($resourceProperty->isKindOf(ResourcePropertyKind::PRIMITIVE)) {
@@ -955,7 +955,7 @@ 
                     $propertyValue,
                     $propertyName,
                     $complexResourceType,
-                    $relativeUri.'/'.$propertyName,
+                    $relativeUri . '/' . $propertyName,
                     $odataPropertyContent
                 );
             } else {

src/POData/Providers/Metadata/SimpleMetadataProvider.php

Doc Comments +4 added lines, -4 removed lines

@@ -446,10 +446,10 @@ 
 
     /**
      * @param \ReflectionClass $refClass
-     * @param $name
-     * @param $namespace
+     * @param string $name
+     * @param string|null $namespace
      * @param $typeKind
-     * @param $baseResourceType
+     * @param null|ResourceType $baseResourceType
      *
      * @throws InvalidOperationException
      *
@@ -474,7 +474,7 @@ 
     }
 
     /**
-     * @param $name
+     * @param string $name
      * @param ResourceType $resourceType
      *
      * @throws InvalidOperationException

Spacing +4 added lines, -4 removed lines

@@ -167,11 +167,11 @@ 
 
         $targetResourceSet = $targetResourceProperty->getResourceType()->getCustomState();
         if (is_null($targetResourceSet)) {
-            throw new InvalidOperationException('Failed to retrieve the custom state from '.$targetResourceProperty->getResourceType()->getName());
+            throw new InvalidOperationException('Failed to retrieve the custom state from ' . $targetResourceProperty->getResourceType()->getName());
         }
 
         //Customer_Orders_Orders, Order_Customer_Customers
-        $key = $sourceResourceType->getName().'_'.$targetResourceProperty->getName().'_'.$targetResourceSet->getName();
+        $key = $sourceResourceType->getName() . '_' . $targetResourceProperty->getName() . '_' . $targetResourceSet->getName();
         if (array_key_exists($key, $this->associationSets)) {
             return $this->associationSets[$key];
         }
@@ -430,12 +430,12 @@ 
         //Create instance of AssociationSet for this relationship
         $sourceResourceSet = $resourceType->getCustomState();
         if (is_null($sourceResourceSet)) {
-            throw new InvalidOperationException('Failed to retrieve the custom state from '.$resourceType->getName());
+            throw new InvalidOperationException('Failed to retrieve the custom state from ' . $resourceType->getName());
         }
 
         //Customer_Orders_Orders, Order_Customer_Customers
         //(source type::name _ source property::name _ target set::name)
-        $setKey = $resourceType->getName().'_'.$name.'_'.$targetResourceSet->getName();
+        $setKey = $resourceType->getName() . '_' . $name . '_' . $targetResourceSet->getName();
         $set = new ResourceAssociationSet(
             $setKey,
             new ResourceAssociationSetEnd($sourceResourceSet, $resourceType, $resourceProperty),

src/POData/Providers/ProvidersQueryWrapper.php

Doc Comments +1 added lines, -1 removed lines

@@ -444,7 +444,7 @@
     }
 
     /**
-     * @param $methodName
+     * @param string $methodName
      * @param $entityInstance
      * @param ResourceSet $resourceSet
      *

Spacing +2 added lines, -2 removed lines

@@ -412,8 +412,8 @@
      */
     private function validateEntityInstance(
         $entityInstance,
-        ResourceSet &$resourceSet,
-        KeyDescriptor &$keyDescriptor,
+        ResourceSet & $resourceSet,
+        KeyDescriptor & $keyDescriptor,
         $methodName
     ) {
         if (is_null($entityInstance)) {

src/POData/UriProcessor/RequestExpander.php

Doc Comments +7 added lines, -7 removed lines

@@ -301,7 +301,7 @@ 
     }
 
     /**
-     * @param $expandedProjectionNode
+     * @param ExpandedProjectionNode $expandedProjectionNode
      * @param $entry
      *
      * @return null|\object[]
@@ -329,10 +329,10 @@ 
     }
 
     /**
-     * @param $expandedProjectionNode
+     * @param ExpandedProjectionNode $expandedProjectionNode
      * @param $entry
-     * @param $resourceType
-     * @param $expandedPropertyName
+     * @param \POData\Providers\Metadata\ResourceType $resourceType
+     * @param string $expandedPropertyName
      *
      * @throws InvalidOperationException
      * @throws \POData\Common\ODataException
@@ -363,9 +363,9 @@ 
     /**
      * @param $entry
      * @param $result
-     * @param $expandedProjectionNode
-     * @param $resourceType
-     * @param $expandedPropertyName
+     * @param ExpandedProjectionNode $expandedProjectionNode
+     * @param \POData\Providers\Metadata\ResourceType $resourceType
+     * @param string $expandedPropertyName
      *
      * @throws InvalidOperationException
      */

Spacing +2 added lines, -2 removed lines

@@ -194,7 +194,7 @@ 
      *
      * @return bool true if a segment was pushed, false otherwise
      */
-    private function pushSegmentForNavigationProperty(ResourceProperty &$resourceProperty)
+    private function pushSegmentForNavigationProperty(ResourceProperty & $resourceProperty)
     {
         if ($resourceProperty->getTypeKind() == ResourceTypeKind::ENTITY) {
             assert(!empty($this->getStack()->getSegmentNames()), '!is_empty($this->getStack()->getSegmentNames())');
@@ -279,7 +279,7 @@ 
      *
      * @return bool true if the segment was push, false otherwise
      */
-    private function pushSegment($segmentName, ResourceSetWrapper &$resourceSetWrapper)
+    private function pushSegment($segmentName, ResourceSetWrapper & $resourceSetWrapper)
     {
         return $this->getStack()->pushSegment($segmentName, $resourceSetWrapper);
     }

src/POData/BaseService.php

Spacing +6 added lines, -6 removed lines

@@ -665,7 +665,7 @@ 
      */
     protected function compareETag(
         &$entryObject,
-        ResourceType &$resourceType,
+        ResourceType & $resourceType,
         &$needToSerializeResponse
     ) {
         $needToSerializeResponse = true;
@@ -716,7 +716,7 @@ 
             // but that is causing an issue in Linux env where the
             // firefix browser is unable to parse the ETag in this case.
             // Need to follow up PHP core devs for this.
-            $eTag = ODataConstants::HTTP_WEAK_ETAG_PREFIX.$eTag.'"';
+            $eTag = ODataConstants::HTTP_WEAK_ETAG_PREFIX . $eTag . '"';
             if (!is_null($ifMatch)) {
                 if (0 != strcmp($eTag, $ifMatch)) {
                     // Requested If-Match value does not match with current
@@ -739,7 +739,7 @@ 
             // but that is causing an issue in Linux env where the
             // firefix browser is unable to parse the ETag in this case.
             // Need to follow up PHP core devs for this.
-            $eTag = ODataConstants::HTTP_WEAK_ETAG_PREFIX.$eTag.'"';
+            $eTag = ODataConstants::HTTP_WEAK_ETAG_PREFIX . $eTag . '"';
         }
 
         return $eTag;
@@ -758,7 +758,7 @@ 
      *                     for use in a URI) there are etag properties, NULL if
      *                     there is no etag property
      */
-    protected function getETagForEntry(&$entryObject, ResourceType &$resourceType)
+    protected function getETagForEntry(&$entryObject, ResourceType & $resourceType)
     {
         $eTag = null;
         $comma = null;
@@ -777,8 +777,8 @@ 
                 );
             }
 
-            $eTagBase = $eTag.$comma;
-            $eTag = $eTagBase.((null == $value) ? 'null' : $type->convertToOData($value));
+            $eTagBase = $eTag . $comma;
+            $eTag = $eTagBase . ((null == $value) ? 'null' : $type->convertToOData($value));
 
             $comma = ',';
         }

src/POData/UriProcessor/XML2Array.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
                     throw new \Exception();
                 }
             } catch (\Exception $ex) {
-                throw new \Exception('[XML2Array] Error parsing the XML string.'.PHP_EOL.$ex->getMessage());
+                throw new \Exception('[XML2Array] Error parsing the XML string.' . PHP_EOL . $ex->getMessage());
             }
         } elseif (is_object($input_xml)) {
             if (get_class($input_xml) != 'DOMDocument') {

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

Spacing +2 added lines, -2 removed lines

@@ -315,7 +315,7 @@ 
                 if ($hasPredicate) {
                     $this->_assertion(!$current->isSingleResult());
                     $keyDescriptor = $this->_createKeyDescriptor(
-                        $identifier.'('.$keyPredicate.')',
+                        $identifier . '(' . $keyPredicate . ')',
                         $projectedProperty->getResourceType(),
                         $keyPredicate
                     );
@@ -394,7 +394,7 @@ 
         $descriptor->setTargetKind(TargetKind::RESOURCE());
         if ($keyPredicate !== null) {
             $keyDescriptor = $this->_createKeyDescriptor(
-                $segmentIdentifier.'('.$keyPredicate.')',
+                $segmentIdentifier . '(' . $keyPredicate . ')',
                 $resourceSetWrapper->getResourceType(),
                 $keyPredicate
             );

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

Spacing +1 added lines, -1 removed lines

@@ -273,7 +273,7 @@
                 if (!array_key_exists($keyName, $this->_namedValues)) {
                     $keysAsString = null;
                     foreach (array_keys($keyProperties) as $key) {
-                        $keysAsString .= $key.', ';
+                        $keysAsString .= $key . ', ';
                     }
 
                     $keysAsString = rtrim($keysAsString, ' ,');