Merge pull request #51 from mhor/analysis-864y1W

Applied fixes from StyleCI
mhor · May 2, 2016 · aaad5e7 · aaad5e7
2 parents 54f17be + 52d7e16
commit aaad5e7
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 33 deletions.
diff --git a/src/Container/MediaInfoContainer.php b/src/Container/MediaInfoContainer.php
@@ -222,19 +222,19 @@ private function addOther(Other $other)
     {
         $this->others[] = $other;
     }
-    
+
     /**
-     * Convert the object into array
+     * Convert the object into array.
      *
      * @return array
      */
     public function jsonSerialize()
     {
         return get_object_vars($this);
     }
-    
+
     /**
-     * Dump object to array
+     * Dump object to array.
      *
      * @return array
      */

diff --git a/src/Type/AbstractType.php b/src/Type/AbstractType.php
@@ -34,28 +34,26 @@ public function get($attribute = null)
         if (isset($this->attributes[$attribute])) {
             return $this->attributes[$attribute];
         }
-
-        return;
     }
-    
+
     /**
-     * Convert the object into json
+     * Convert the object into json.
      *
      * @return array
      */
     public function jsonSerialize()
     {
         $array = get_object_vars($this);
-        
+
         if (isset($array['attributes'])) {
             $array = $array['attributes'];
         }
-        
+
         return $array;
     }
 
     /**
-     * Convert the object into array
+     * Convert the object into array.
      *
      * @return array
      */

diff --git a/test/Container/MediaInfoContainerTest.php b/test/Container/MediaInfoContainerTest.php
@@ -1,64 +1,64 @@
 <?php
 
-use Mhor\MediaInfo\Container\MediaInfoContainer,
-    Mhor\MediaInfo\Type\General,
-    Mhor\MediaInfo\Type\Audio;
+use Mhor\MediaInfo\Container\MediaInfoContainer;
+use Mhor\MediaInfo\Type\Audio;
+use Mhor\MediaInfo\Type\General;
 
 class MediaInfoContainerTest extends \PHPUnit_Framework_TestCase
 {
     private function createContainer()
     {
         $mediaInfoContainer = new MediaInfoContainer();
-        
+
         $general = new General();
-        
+
         $general->set('Format', 'MPEG Audio');
         $general->set('Duration', '1mn 20s');
-        
+
         $audio = new Audio();
-        
+
         $audio->set('Format', 'MPEG Audio');
         $audio->set('Bit rate', '56.0 Kbps');
-        
+
         $mediaInfoContainer->add($audio);
         $mediaInfoContainer->add($general);
-        
+
         return $mediaInfoContainer;
     }
-    
+
     public function testToJson()
     {
         $mediaInfoContainer = $this->createContainer();
-        
+
         $data = json_encode($mediaInfoContainer);
-        
+
         $this->assertRegExp('/^\{.+\}$/', $data);
     }
-    
+
     public function testToJsonType()
     {
         $mediaInfoContainer = $this->createContainer();
-        
+
         $data = json_encode($mediaInfoContainer->getGeneral());
-        
+
         $this->assertRegExp('/^\{.+\}$/', $data);
     }
-    
+
     public function testToArray()
     {
         $mediaInfoContainer = $this->createContainer();
-        
+
         $array = $mediaInfoContainer->__toArray();
-        
+
         $this->assertArrayHasKey('version', $array);
     }
-    
+
     public function testToArrayType()
     {
         $mediaInfoContainer = $this->createContainer();
-        
+
         $array = $mediaInfoContainer->getGeneral()->__toArray();
-        
+
         $this->assertTrue(is_array($array));
     }
-}
+}