powered-by-moe / MusicBrainz

src/MusicBrainz/MusicBrainz.php

Doc Comments +6 added lines, -6 removed lines

@@ -442,8 +442,8 @@ 
     }
 
     /**
-     * @param       $entity
-     * @param       $mbid
+     * @param       string $entity
+     * @param       string $mbid
      * @param array $includes
      * @param int   $limit
      * @param null  $offset
@@ -560,7 +560,7 @@ 
     /**
      * Check the list of allowed entities
      *
-     * @param $entity
+     * @param string $entity
      *
      * @return bool
      */
@@ -572,7 +572,7 @@ 
     /**
      * Some calls require authentication
      *
-     * @param $entity
+     * @param string $entity
      * @param $includes
      *
      * @return bool
@@ -719,7 +719,7 @@ 
     /**
      * Returns the MusicBrainz user
      *
-     * @return null|string
+     * @return string
      */
     public function getUser()
     {
@@ -739,7 +739,7 @@ 
     /**
      * Returns the user’s password
      *
-     * @return null|string
+     * @return string
      */
     public function getPassword()
     {

Braces +18 added lines, -36 removed lines

@@ -289,8 +289,7 @@ 
      * @param string                           $user
      * @param string                           $password
      */
-    public function __construct(AbstractHttpAdapter $adapter, $user = null, $password = null)
-    {
+    public function __construct(AbstractHttpAdapter $adapter, $user = null, $password = null) {
         $this->adapter = $adapter;
 
         if (null != $user) {
@@ -314,8 +313,7 @@ 
      * @throws Exception
      * @return array
      */
-    public function lookup($entity, $mbid, array $includes = array())
-    {
+    public function lookup($entity, $mbid, array $includes = array()) {
 
         if (!$this->isValidEntity($entity)) {
             throw new Exception('Invalid entity');
@@ -394,8 +392,7 @@ 
      * @return array
      * @throws Exception
      */
-    public function browseArtist($entity, $mbid, array $includes = array(), $limit = 25, $offset = null)
-    {
+    public function browseArtist($entity, $mbid, array $includes = array(), $limit = 25, $offset = null) {
         if (!in_array($entity, array('recording', 'release', 'release-group'))) {
             throw new Exception('Invalid browse entity for artist');
         }
@@ -413,8 +410,7 @@ 
      * @return array
      * @throws Exception
      */
-    public function browseLabel($entity, $mbid, array $includes, $limit = 25, $offset = null)
-    {
+    public function browseLabel($entity, $mbid, array $includes, $limit = 25, $offset = null) {
         if (!in_array($entity, array('release'))) {
             throw new Exception('Invalid browse entity for label');
         }
@@ -432,8 +428,7 @@ 
      * @return array
      * @throws Exception
      */
-    public function browseRecording($entity, $mbid, array $includes = array(), $limit = 25, $offset = null)
-    {
+    public function browseRecording($entity, $mbid, array $includes = array(), $limit = 25, $offset = null) {
         if (!in_array($entity, array('artist', 'release'))) {
             throw new Exception('Invalid browse entity for recording');
         }
@@ -530,8 +525,7 @@ 
      * @throws Exception
      * @return array
      */
-    public function search(Filters\FilterInterface $filter, $limit = 25, $offset = null)
-    {
+    public function search(Filters\FilterInterface $filter, $limit = 25, $offset = null) {
         if (count($filter->createParameters()) < 1) {
             throw new Exception('The artist filter object needs at least 1 argument to create a query.');
         }
@@ -552,8 +546,7 @@ 
      *
      * @return int
      */
-    public function isValidMBID($mbid)
-    {
+    public function isValidMBID($mbid) {
         return preg_match("/^(\{)?[a-f\d]{8}(-[a-f\d]{4}){4}[a-f\d]{8}(?(1)\})$/i", $mbid);
     }
 
@@ -564,8 +557,7 @@ 
      *
      * @return bool
      */
-    private function isValidEntity($entity)
-    {
+    private function isValidEntity($entity) {
         return array_key_exists($entity, self::$validIncludes);
     }
 
@@ -577,8 +569,7 @@ 
      *
      * @return bool
      */
-    protected function isAuthRequired($entity, $includes)
-    {
+    protected function isAuthRequired($entity, $includes) {
         if (in_array('user-tags', $includes) || in_array('user-ratings', $includes)) {
             return true;
         }
@@ -597,8 +588,7 @@ 
      * @return bool
      * @throws \OutOfBoundsException
      */
-    public function validateInclude($includes, $validIncludes)
-    {
+    public function validateInclude($includes, $validIncludes) {
         foreach ($includes as $include) {
             if (!in_array($include, $validIncludes)) {
                 throw new \OutOfBoundsException(sprintf('%s is not a valid include', $include));
@@ -615,8 +605,7 @@ 
      * @return bool
      * @throws Exception
      */
-    public function validateFilter($values, $valid)
-    {
+    public function validateFilter($values, $valid) {
         foreach ($values as $value) {
             if (!in_array($value, $valid)) {
                 throw new Exception(sprintf('%s is not a valid filter', $value));
@@ -678,8 +667,7 @@ 
     /**
      * @return array
      */
-    public function getHttpOptions()
-    {
+    public function getHttpOptions() {
         return array(
             'method'     => 'GET',
             'user-agent' => $this->getUserAgent(),
@@ -693,8 +681,7 @@ 
      *
      * @return string
      */
-    public function getUserAgent()
-    {
+    public function getUserAgent() {
         return $this->userAgent;
     }
 
@@ -707,8 +694,7 @@ 
      *
      * @throws Exception
      */
-    public function setUserAgent($application, $version, $contactInfo)
-    {
+    public function setUserAgent($application, $version, $contactInfo) {
         if (strpos($version, '-') !== false) {
             throw new Exception('User agent: version should not contain a "-" character.');
         }
@@ -721,8 +707,7 @@ 
      *
      * @return null|string
      */
-    public function getUser()
-    {
+    public function getUser() {
         return $this->user;
     }
 
@@ -731,8 +716,7 @@ 
      *
      * @param string $user
      */
-    public function setUser($user)
-    {
+    public function setUser($user) {
         $this->user = $user;
     }
 
@@ -741,8 +725,7 @@ 
      *
      * @return null|string
      */
-    public function getPassword()
-    {
+    public function getPassword() {
         return $this->password;
     }
 
@@ -751,8 +734,7 @@ 
      *
      * @param string $password
      */
-    public function setPassword($password)
-    {
+    public function setPassword($password) {
         $this->password = $password;
     }
 }

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

@@ -267,13 +267,13 @@ 
      *
      * @var string
      */
-    private $user = null;
+    private $user = NULL;
     /**
      * The password of a MusicBrainz user. Used for authentication.
      *
      * @var string
      */
-    private $password = null;
+    private $password = NULL;
     /**
      * The Http adapter used to make requests
      *
@@ -289,15 +289,15 @@ 
      * @param string                           $user
      * @param string                           $password
      */
-    public function __construct(AbstractHttpAdapter $adapter, $user = null, $password = null)
+    public function __construct(AbstractHttpAdapter $adapter, $user = NULL, $password = NULL)
     {
         $this->adapter = $adapter;
 
-        if (null != $user) {
+        if (NULL != $user) {
             $this->setUser($user);
         }
 
-        if (null != $password) {
+        if (NULL != $password) {
             $this->setPassword($password);
         }
     }
@@ -354,7 +354,7 @@ 
         $mbid,
         array $includes,
         $limit = 25,
-        $offset = null,
+        $offset = NULL,
         $releaseType = array(),
         $releaseStatus = array()
     ) {
@@ -394,7 +394,7 @@ 
      * @return array
      * @throws Exception
      */
-    public function browseArtist($entity, $mbid, array $includes = array(), $limit = 25, $offset = null)
+    public function browseArtist($entity, $mbid, array $includes = array(), $limit = 25, $offset = NULL)
     {
         if (!in_array($entity, array('recording', 'release', 'release-group'))) {
             throw new Exception('Invalid browse entity for artist');
@@ -413,7 +413,7 @@ 
      * @return array
      * @throws Exception
      */
-    public function browseLabel($entity, $mbid, array $includes, $limit = 25, $offset = null)
+    public function browseLabel($entity, $mbid, array $includes, $limit = 25, $offset = NULL)
     {
         if (!in_array($entity, array('release'))) {
             throw new Exception('Invalid browse entity for label');
@@ -432,7 +432,7 @@ 
      * @return array
      * @throws Exception
      */
-    public function browseRecording($entity, $mbid, array $includes = array(), $limit = 25, $offset = null)
+    public function browseRecording($entity, $mbid, array $includes = array(), $limit = 25, $offset = NULL)
     {
         if (!in_array($entity, array('artist', 'release'))) {
             throw new Exception('Invalid browse entity for recording');
@@ -458,7 +458,7 @@ 
         $mbid,
         array $includes = array(),
         $limit = 25,
-        $offset = null,
+        $offset = NULL,
         $releaseType = array(),
         $releaseStatus = array()
     ) {
@@ -493,7 +493,7 @@ 
         $entity,
         $mbid,
         $limit = 25,
-        $offset = null,
+        $offset = NULL,
         array $includes,
         $releaseType = array()
     ) {
@@ -530,7 +530,7 @@ 
      * @throws Exception
      * @return array
      */
-    public function search(Filters\FilterInterface $filter, $limit = 25, $offset = null)
+    public function search(Filters\FilterInterface $filter, $limit = 25, $offset = NULL)
     {
         if (count($filter->createParameters()) < 1) {
             throw new Exception('The artist filter object needs at least 1 argument to create a query.');
@@ -542,7 +542,7 @@ 
 
         $params = $filter->createParameters(array('limit' => $limit, 'offset' => $offset, 'fmt' => 'json'));
 
-        $response = $this->adapter->call($filter->getEntity() . '/', $params, $this->getHttpOptions(), false, true);
+        $response = $this->adapter->call($filter->getEntity() . '/', $params, $this->getHttpOptions(), FALSE, TRUE);
 
         return $filter->parseResponse($response, $this);
     }
@@ -580,14 +580,14 @@ 
     protected function isAuthRequired($entity, $includes)
     {
         if (in_array('user-tags', $includes) || in_array('user-ratings', $includes)) {
-            return true;
+            return TRUE;
         }
 
         if (substr($entity, 0, strlen('collection')) === 'collection') {
-            return true;
+            return TRUE;
         }
 
-        return false;
+        return FALSE;
     }
 
     /**
@@ -605,7 +605,7 @@ 
             }
         }
 
-        return true;
+        return TRUE;
     }
 
     /**
@@ -623,7 +623,7 @@ 
             }
         }
 
-        return true;
+        return TRUE;
     }
 
     /**
@@ -709,7 +709,7 @@ 
      */
     public function setUserAgent($application, $version, $contactInfo)
     {
-        if (strpos($version, '-') !== false) {
+        if (strpos($version, '-') !== FALSE) {
             throw new Exception('User agent: version should not contain a "-" character.');
         }
 

src/MusicBrainz/Release.php

Doc Comments +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
     /**
      * @param array $releaseEvents
      *
-     * @return array
+     * @return \DateTime
      */
     public function getReleaseEventDates(array $releaseEvents)
     {

Braces +4 added lines, -8 removed lines

@@ -61,8 +61,7 @@ 
      * @param array       $release
      * @param MusicBrainz $brainz
      */
-    public function __construct(array $release, MusicBrainz $brainz)
-    {
+    public function __construct(array $release, MusicBrainz $brainz) {
         $this->data   = $release;
         $this->brainz = $brainz;
 
@@ -80,8 +79,7 @@ 
     /**
      * @return string
      */
-    public function getId()
-    {
+    public function getId() {
         return $this->id;
     }
 
@@ -89,8 +87,7 @@ 
      * Get's the earliest release date
      * @return \DateTime
      */
-    public function getReleaseDate()
-    {
+    public function getReleaseDate() {
         if (null != $this->releaseDate) {
             return $this->releaseDate;
         }
@@ -110,8 +107,7 @@ 
      *
      * @return array
      */
-    public function getReleaseEventDates(array $releaseEvents)
-    {
+    public function getReleaseEventDates(array $releaseEvents) {
 
         $releaseDate = new \DateTime();
 

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

@@ -91,7 +91,7 @@
      */
     public function getReleaseDate()
     {
-        if (null != $this->releaseDate) {
+        if (NULL != $this->releaseDate) {
             return $this->releaseDate;
         }
 

examples/first-recording-search.php

Braces +2 added lines, -1 removed lines

@@ -67,6 +67,7 @@
     }
 
     var_dump(array($firstRecording));
-} catch (Exception $e) {
+}
+catch (Exception $e) {
     print ($e->getMessage());
 }

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

@@ -13,18 +13,18 @@ 
 
 // set defaults
 $releaseDate    = new DateTime();
-$artistId       = null;
-$songId         = null;
+$artistId       = NULL;
+$songId         = NULL;
 $trackLen       = -1;
 $albumName      = '';
-$lastScore      = null;
+$lastScore      = NULL;
 $firstRecording = array(
-    'release'     => null,
+    'release'     => NULL,
     'releaseDate' => new DateTime(),
-    'recording'   => null,
-    'artistId'    => null,
-    'recordingId' => null,
-    'trackLength' => null
+    'recording'   => NULL,
+    'artistId'    => NULL,
+    'recordingId' => NULL,
+    'trackLength' => NULL
 );
 
 // Set the search arguments to pass into the RecordingFilter
@@ -43,7 +43,7 @@ 
 
         // if the recording has a lower score than the previous recording, stop the loop.
         // This is because scores less than 100 usually don't match the search well
-        if (null != $lastScore && $recording->getScore() < $lastScore) {
+        if (NULL != $lastScore && $recording->getScore() < $lastScore) {
             break;
         }
 

examples/search.php

Braces +8 added lines, -4 removed lines

@@ -24,7 +24,8 @@ 
 try {
     $releaseGroups = $brainz->search(new ReleaseGroupFilter($args));
     var_dump($releaseGroups);
-} catch (Exception $e) {
+}
+catch (Exception $e) {
     print $e->getMessage();
 }
 print "\n\n";
@@ -41,7 +42,8 @@ 
 try {
     $artists = $brainz->search(new ArtistFilter($args));
     print_r($artists);
-} catch (Exception $e) {
+}
+catch (Exception $e) {
     print $e->getMessage();
 }
 print "\n\n";
@@ -59,7 +61,8 @@ 
 try {
     $recordings = $brainz->search(new RecordingFilter($args));
     print_r($recordings);
-} catch (Exception $e) {
+}
+catch (Exception $e) {
     print $e->getMessage();
 }
 print "\n\n";
@@ -75,6 +78,7 @@ 
 try {
     $labels = $brainz->search(new LabelFilter($args));
     print_r($labels);
-} catch (Exception $e) {
+}
+catch (Exception $e) {
     print $e->getMessage();
 }

examples/lookup.php

Braces +4 added lines, -2 removed lines

@@ -24,7 +24,8 @@ 
 try {
     $artist = $brainz->lookup('artist', '4dbf5678-7a31-406a-abbe-232f8ac2cd63', $includes);
     print_r($artist);
-} catch (Exception $e) {
+}
+catch (Exception $e) {
     print $e->getMessage();
 }
 print "\n\n";
@@ -38,6 +39,7 @@ 
     //born this way: the remix
     $releaseGroup = $brainz->lookup('release-group', 'e4307c5f-1959-4163-b4b1-ded4f9d786b0');
     print_r($releaseGroup);
-} catch (Exception $e) {
+}
+catch (Exception $e) {
     echo $e->getMessage();
 }

src/MusicBrainz/Artist.php

Braces +6 added lines, -12 removed lines

@@ -59,8 +59,7 @@ 
      *
      * @throws Exception
      */
-    public function __construct(array $artist, MusicBrainz $brainz)
-    {
+    public function __construct(array $artist, MusicBrainz $brainz) {
         if (!isset($artist['id']) || isset($artist['id']) && !$brainz->isValidMBID($artist['id'])) {
             throw new Exception('Can not create artist object. Missing valid MBID');
         }
@@ -81,32 +80,28 @@ 
     /**
      * @return mixed
      */
-    public function getName()
-    {
+    public function getName() {
         return $this->name;
     }
 
     /**
      * @return int
      */
-    public function getScore()
-    {
+    public function getScore() {
         return isset($this->data['score']) ? (int)$this->data['score'] : 0;
     }
 
     /**
      * @return string
      */
-    public function getType()
-    {
+    public function getType() {
         return $this->type;
     }
 
     /**
      * @return array
      */
-    public function getReleases()
-    {
+    public function getReleases() {
         if (null === $this->releases) {
             $this->releases = $this->brainz->browseRelease('artist', $this->getId());
         }
@@ -117,8 +112,7 @@ 
     /**
      * @return string
      */
-    public function getId()
-    {
+    public function getId() {
         return $this->id;
     }
 }

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

@@ -74,8 +74,8 @@ 
         $this->sortName  = isset($artist['sort-name']) ? (string)$artist['sort-name'] : '';
         $this->gender    = isset($artist['gender']) ? (string)$artist['gender'] : '';
         $this->country   = isset($artist['country']) ? (string)$artist['country'] : '';
-        $this->beginDate = isset($artist['life-span']['begin']) ? $artist['life-span']['begin'] : null;
-        $this->endDate   = isset($artist['life-span']['ended']) ? $artist['life-span']['ended'] : null;
+        $this->beginDate = isset($artist['life-span']['begin']) ? $artist['life-span']['begin'] : NULL;
+        $this->endDate   = isset($artist['life-span']['ended']) ? $artist['life-span']['ended'] : NULL;
     }
 
     /**
@@ -107,7 +107,7 @@ 
      */
     public function getReleases()
     {
-        if (null === $this->releases) {
+        if (NULL === $this->releases) {
             $this->releases = $this->brainz->browseRelease('artist', $this->getId());
         }
 

src/MusicBrainz/Country.php

Braces +1 added lines, -2 removed lines

@@ -25,8 +25,7 @@
      * @throws \OutOfBoundsException
      * @return bool
      */
-    public static function getName($countryCode)
-    {
+    public static function getName($countryCode) {
         if (!isset(self::$countries[$countryCode])) {
             throw new \OutOfBoundsException(
                 sprintf(

src/MusicBrainz/Label.php

Braces +1 added lines, -2 removed lines

@@ -41,8 +41,7 @@
      * @param array       $label
      * @param MusicBrainz $brainz
      */
-    public function __construct(array $label, MusicBrainz $brainz)
-    {
+    public function __construct(array $label, MusicBrainz $brainz) {
         $this->data   = $label;
         $this->brainz = $brainz;
 

src/MusicBrainz/ReleaseGroup.php

Braces +5 added lines, -10 removed lines

@@ -29,8 +29,7 @@ 
      * @param array       $releaseGroup
      * @param MusicBrainz $brainz
      */
-    public function __construct(array $releaseGroup, MusicBrainz $brainz)
-    {
+    public function __construct(array $releaseGroup, MusicBrainz $brainz) {
         $this->data   = $releaseGroup;
         $this->brainz = $brainz;
 
@@ -40,32 +39,28 @@ 
     /**
      * @return string
      */
-    public function getId()
-    {
+    public function getId() {
         return $this->id;
     }
 
     /**
      * @return string
      */
-    public function getTitle()
-    {
+    public function getTitle() {
         return $this->data['title'];
     }
 
     /**
      * @return mixed
      */
-    public function getScore()
-    {
+    public function getScore() {
         return $this->data['score'];
     }
 
     /**
      * @return Release[]
      */
-    public function getReleases()
-    {
+    public function getReleases() {
         if (!empty($this->releases)) {
             return $this->releases;
         }