PBXg33k / php-traits

src/ReflectionTrait.php

Spacing +4 added lines, -4 removed lines

@@ -13,11 +13,11 @@ 
 {
     public function getClassFromClassProperty($class, $property)
     {
-        if(!class_exists($class)) {
-            throw new \Exception($class. ' not found or does not exist');
+        if (!class_exists($class)) {
+            throw new \Exception($class . ' not found or does not exist');
         }
         
-        if(!property_exists($class, $property)) {
+        if (!property_exists($class, $property)) {
             throw new \Exception($class . ' has no property with the name ' . $property);
         }
     }
@@ -36,7 +36,7 @@ 
         if (preg_match('~\@var[\s]+([A-Za-z0-9\\\\]+)~', $comment, $matches)) {
             if ($includeNamespaces) {
                 if ($reflectionClass instanceof \ReflectionClass && !in_array($matches[1], HydratableTrait::$nonObjectTypes)) {
-                    if($reflectionClass->getNamespaceName()) {
+                    if ($reflectionClass->getNamespaceName()) {
                         return sprintf('\%s\%s', $reflectionClass->getNamespaceName(), $matches[1]);
                     } else {
                         return sprintf('\%s', $matches[1]);

Braces +2 added lines, -4 removed lines

@@ -11,8 +11,7 @@ 
  */
 trait ReflectionTrait
 {
-    public function getClassFromClassProperty($class, $property)
-    {
+    public function getClassFromClassProperty($class, $property) {
         if(!class_exists($class)) {
             throw new \Exception($class. ' not found or does not exist');
         }
@@ -31,8 +30,7 @@ 
      *
      * @return bool|string
      */
-    public static function getClassFromDocComment($comment, $includeNamespaces = true, $reflectionClass = null)
-    {
+    public static function getClassFromDocComment($comment, $includeNamespaces = true, $reflectionClass = null) {
         if (preg_match('~\@var[\s]+([A-Za-z0-9\\\\]+)~', $comment, $matches)) {
             if ($includeNamespaces) {
                 if ($reflectionClass instanceof \ReflectionClass && !in_array($matches[1], HydratableTrait::$nonObjectTypes)) {

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
      *
      * @return bool|string
      */
-    public static function getClassFromDocComment($comment, $includeNamespaces = true, $reflectionClass = null)
+    public static function getClassFromDocComment($comment, $includeNamespaces = TRUE, $reflectionClass = NULL)
     {
         if (preg_match('~\@var[\s]+([A-Za-z0-9\\\\]+)~', $comment, $matches)) {
             if ($includeNamespaces) {
@@ -49,6 +49,6 @@ 
             }
         }
 
-        return false;
+        return FALSE;
     }
 }
\ No newline at end of file

src/HydratableTrait.php

Spacing +2 added lines, -4 removed lines

@@ -64,9 +64,7 @@ 
 
             // Convert key to a propertyname in $this
             $propertyName = lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', $itemKey))));
-            $propertyName = (property_exists($this, $propertyName)) ? $propertyName :
-                (property_exists($this, lcfirst($propertyName)) ? lcfirst($propertyName) :
-                    preg_replace_callback('/([A-Z])/', function ($match) {
+            $propertyName = (property_exists($this, $propertyName)) ? $propertyName : (property_exists($this, lcfirst($propertyName)) ? lcfirst($propertyName) : preg_replace_callback('/([A-Z])/', function ($match) {
                         return strtolower('_' . $match[1]);
                     }, lcfirst($propertyName))
                 );
@@ -87,7 +85,7 @@ 
 
                     if (in_array($propertyClassName, self::$nonObjectTypes)) {
                         $this->setPropertyValue($propertyName, $itemValue, true);
-                    } elseif(interface_exists($propertyClassName)) {
+                    } elseif (interface_exists($propertyClassName)) {
                         // We cannot instantiate an interface, so we skip it
                         continue;
                     } else {

Braces +2 added lines, -4 removed lines

@@ -54,8 +54,7 @@ 
      * @param  object|array $class class
      * @return object
      */
-    public function hydrateClass($class)
-    {
+    public function hydrateClass($class) {
         $reflection = new \ReflectionClass($this);
 
         // Iterate over $class for properties
@@ -123,8 +122,7 @@ 
      * @param bool $fix Fix errors
      * @return void
      */
-    private function checkObjectForErrors(&$object, $fix = false)
-    {
+    private function checkObjectForErrors(&$object, $fix = false) {
         if ($object instanceof \DateTime) {
             // The constructor (passed from the API) is NULL, indicating an empty value
             // PHP DateTime's default value is now()

Upper-Lower-Casing +8 added lines, -8 removed lines

@@ -77,16 +77,16 @@ 
                 && $reflectionProperty = $reflection->getProperty($propertyName)
             ) {
                 // Get the expected property class from the property's DocBlock
-                if ($propertyClassName = ReflectionTrait::getClassFromDocComment($reflectionProperty->getDocComment(), true,
+                if ($propertyClassName = ReflectionTrait::getClassFromDocComment($reflectionProperty->getDocComment(), TRUE,
                     $reflection)
                 ) {
 
                     // Set argument for constructor (if any), in case we're dealing with an object (IE: DateTime)
                     $this->objectConstructorArguments = (in_array($propertyClassName, $this->giveDataInConstructor))
-                        ? $itemValue : null;
+                        ? $itemValue : NULL;
 
                     if (in_array($propertyClassName, self::$nonObjectTypes)) {
-                        $this->setPropertyValue($propertyName, $itemValue, true);
+                        $this->setPropertyValue($propertyName, $itemValue, TRUE);
                     } elseif(interface_exists($propertyClassName)) {
                         // We cannot instantiate an interface, so we skip it
                         continue;
@@ -95,7 +95,7 @@ 
 
                         // Check if $object has valid values
                         // IE: DateTime with a negative timestamp will cause a SQL Error
-                        $this->checkObjectForErrors($object, true);
+                        $this->checkObjectForErrors($object, TRUE);
 
                         if ($object) {
                             if (
@@ -105,7 +105,7 @@ 
                                 $object->fromClass($itemValue);
                             }
                             // We're done. Assign the result to the propery of $this
-                            $this->setPropertyValue($propertyName, $object, true);
+                            $this->setPropertyValue($propertyName, $object, TRUE);
                         }
                     }
                     unset($object);
@@ -123,13 +123,13 @@ 
      * @param bool $fix Fix errors
      * @return void
      */
-    private function checkObjectForErrors(&$object, $fix = false)
+    private function checkObjectForErrors(&$object, $fix = FALSE)
     {
         if ($object instanceof \DateTime) {
             // The constructor (passed from the API) is NULL, indicating an empty value
             // PHP DateTime's default value is now()
-            if ($this->objectConstructorArguments == null) {
-                $object = null;
+            if ($this->objectConstructorArguments == NULL) {
+                $object = NULL;
             } else {
                 if (!$object->getTimestamp()) {
                     // DateTime has a negative or false value