WS fixes

jackalope · May 9, 2011 · 60bafe7 · 60bafe7
1 parent 4e35018
commit 60bafe7
Showing 1 changed file with 16 additions and 19 deletions.
diff --git a/src/Jackalope/Transport/Davex/Client.php b/src/Jackalope/Transport/Davex/Client.php
@@ -360,7 +360,7 @@ public function getProperty($path)
     public function getBinaryStream($path)
     {
         $request = $this->getRequest(Request::GET, $path);
-        //OPTIMIZE!
+        // TODO: OPTIMIZE!
         $binary = $request->execute();
         $stream = fopen('php://memory', 'rwb+');
         fwrite($stream, $binary);
@@ -493,7 +493,6 @@ public function query(\PHPCR\Query\QueryInterface $query)
         return $rows;
     }
 
-
     /**
      * checks if the path is absolute, throws an exception if it is not
      *
@@ -582,7 +581,6 @@ public function copyNode($srcAbsPath, $dstAbsPath, $srcWorkspace = null)
         $request->execute();
     }
 
-
     /**
      * Moves a node from src to dst
      *
@@ -608,7 +606,6 @@ public function cloneFrom($srcWorkspace, $srcAbsPath, $destAbsPath, $removeExist
         throw new NotImplementedException();
     }
 
-
     /**
      * Recursively store a node and its children to the given absolute path.
      *
@@ -756,15 +753,15 @@ public function storeProperty(\PHPCR\PropertyInterface $property)
     protected function propertyToXmlString($value, $type)
     {
         switch ($type) {
-        case \PHPCR\PropertyType::TYPENAME_DATE:
-            return $value->format(\Jackalope\Helper::DATETIME_FORMAT);
-        case \PHPCR\PropertyType::TYPENAME_BINARY:
-            return base64_encode(stream_get_contents($value));
-        case \PHPCR\PropertyType::TYPENAME_UNDEFINED:
-        case \PHPCR\PropertyType::TYPENAME_STRING:
-        case \PHPCR\PropertyType::TYPENAME_URI:
-            $value = str_replace(']]>',']]]]><![CDATA[>',$value);
-            return '<![CDATA['.$value.']]>';
+            case \PHPCR\PropertyType::TYPENAME_DATE:
+                return $value->format(\Jackalope\Helper::DATETIME_FORMAT);
+            case \PHPCR\PropertyType::TYPENAME_BINARY:
+                return base64_encode(stream_get_contents($value));
+            case \PHPCR\PropertyType::TYPENAME_UNDEFINED:
+            case \PHPCR\PropertyType::TYPENAME_STRING:
+            case \PHPCR\PropertyType::TYPENAME_URI:
+                $value = str_replace(']]>',']]]]><![CDATA[>',$value);
+                return '<![CDATA['.$value.']]>';
         }
         //FIXME: handle boolean correctly. strings true and false?
         return $value;
@@ -780,12 +777,12 @@ protected function propertyToXmlString($value, $type)
     protected function propertyToRawString($value, $type)
     {
         switch ($type) {
-        case \PHPCR\PropertyType::TYPENAME_BINARY:
-            return stream_get_contents($value);
-        case \PHPCR\PropertyType::TYPENAME_UNDEFINED:
-        case \PHPCR\PropertyType::TYPENAME_STRING:
-        case \PHPCR\PropertyType::TYPENAME_URI:
-            return $value;
+            case \PHPCR\PropertyType::TYPENAME_BINARY:
+                return stream_get_contents($value);
+            case \PHPCR\PropertyType::TYPENAME_UNDEFINED:
+            case \PHPCR\PropertyType::TYPENAME_STRING:
+            case \PHPCR\PropertyType::TYPENAME_URI:
+                return $value;
         }
         return $this->propertyToXmlString($value, $type);
     }