Use PHP CS Fixer and update .travis.yml

FriendsOfPHP · Nov 16, 2014 · 558479d · 558479d
1 parent 1e9a7f9
commit 558479d
Show file tree

Hide file tree

Showing 21 changed files with 220 additions and 73 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,9 @@
 language: php
 
-before_script: composer install --dev
-
 php:
-  - 5.3
-  - 5.4
+    - 5.3
+    - 5.4
 
+install:
+    - travis_retry composer install --no-interaction --prefer-source
+    - vendor/bin/php-cs-fixer --diff --dry-run fix .
diff --git a/composer.json b/composer.json
@@ -27,6 +27,7 @@
         "sensiolabs/ansi-to-html": "~1.0"
     },
     "require-dev": {
+        "fabpot/php-cs-fixer": "~1.0",
         "phpunit/phpunit": "3.7.*",
         "symfony/browser-kit": "~2.2",
         "symfony/css-selector": "~2.2.0",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Sismo/BitbucketProject.php b/src/Sismo/BitbucketProject.php
@@ -39,7 +39,7 @@ public function setRepository($url)
             $repo = preg_split('/\//', $this->getRepository());
 
             $this->setUrlPattern(sprintf('https://bitbucket.org/%s/commits/%%commit%%', $this->getRepository()));
-            $this->setBitBucketRepository( sprintf('git@bitbucket.org:/%s.git', $this->getRepository()) );
+            $this->setBitBucketRepository(sprintf('git@bitbucket.org:/%s.git', $this->getRepository()));
         } else {
             throw new \InvalidArgumentException(sprintf('URL "%s" does not look like a BitBucket repository.', $this->getRepository()));
         }

diff --git a/src/Sismo/Contrib/AndroidPushC2DMNotifier.php b/src/Sismo/Contrib/AndroidPushC2DMNotifier.php
@@ -46,7 +46,7 @@ class AndroidPushC2DMNotifier extends Notifier
      * @param string $service
      */
     public function __construct($username, $password, $deviceRegistrationId, $messageFormat = '',
-                                $source = 'Company-AppName-Version', $msgType = 'SismoNotifierMsgType', $service='ac2dm')
+                                $source = 'Company-AppName-Version', $msgType = 'SismoNotifierMsgType', $service = 'ac2dm')
     {
         $this->authCode             = $this->getGoogleAuthCodeHelper($username, $password, $source, $service);
         $this->deviceRegistrationId = $deviceRegistrationId;
@@ -58,11 +58,11 @@ public function notify(Commit $commit)
     {
         $message = $this->format($this->messageFormat, $commit);
 
-        $headers = array('Authorization: GoogleLogin auth=' . $this->authCode);
+        $headers = array('Authorization: GoogleLogin auth='.$this->authCode);
         $data = array(
             'registration_id' => $this->deviceRegistrationId,
             'collapse_key'    => $this->msgType,
-            'data.message'    => $message
+            'data.message'    => $message,
         );
 
         $ch = curl_init();
@@ -89,19 +89,19 @@ public function notify(Commit $commit)
         return true;
     }
 
-    public function getGoogleAuthCodeHelper($username, $password, $source='Company-AppName-Version', $service='ac2dm')
+    public function getGoogleAuthCodeHelper($username, $password, $source = 'Company-AppName-Version', $service = 'ac2dm')
     {
         $ch = curl_init();
         if (!$ch) {
             return false;
         }
 
         curl_setopt($ch, CURLOPT_URL, "https://www.google.com/accounts/ClientLogin");
-        $postFields = "accountType=" . urlencode('HOSTED_OR_GOOGLE')
-            . "&Email=" . urlencode($username)
-            . "&Passwd=" . urlencode($password)
-            . "&source=" . urlencode($source)
-            . "&service=" . urlencode($service);
+        $postFields = "accountType=".urlencode('HOSTED_OR_GOOGLE')
+            ."&Email=".urlencode($username)
+            ."&Passwd=".urlencode($password)
+            ."&source=".urlencode($source)
+            ."&service=".urlencode($service);
         curl_setopt($ch, CURLOPT_HEADER, true);
         curl_setopt($ch, CURLOPT_POST, true);
         curl_setopt($ch, CURLOPT_POSTFIELDS, $postFields);
@@ -128,6 +128,5 @@ public function getGoogleAuthCodeHelper($username, $password, $source='Company-A
 
         return $matches[2];
     }
-
 }
 // @codeCoverageIgnoreEnd
diff --git a/src/Sismo/Contrib/CrossFingerNotifier.php b/src/Sismo/Contrib/CrossFingerNotifier.php
@@ -48,7 +48,7 @@ public function __construct($notifiers = array())
     /**
      * Notifies a commit.
      *
-     * @param Commit $commit Then Commit instance
+     * @param  Commit  $commit Then Commit instance
      * @return Boolean whether notification has been sent or not
      */
     public function notify(Commit $commit)
@@ -68,7 +68,7 @@ public function notify(Commit $commit)
      * Determines if a build needs to be notify
      * based on his status and his predecessor's one
      *
-     * @param Commit $commit The commit to analyse
+     * @param  Commit  $commit The commit to analyse
      * @return Boolean whether the commit need notification or not
      */
     protected function commitNeedNotification(Commit $commit)

diff --git a/src/Sismo/Contrib/GithubNotifier.php b/src/Sismo/Contrib/GithubNotifier.php
@@ -40,8 +40,8 @@ class GithubNotifier extends Notifier
     protected $targetUrlPattern = null;
 
     /**
-     * @param string $apikey personal API key
-     * @param string $repo repository name, e.g. fabpot/Sismo
+     * @param string $apikey           personal API key
+     * @param string $repo             repository name, e.g. fabpot/Sismo
      * @param string $targetUrlPattern status target URL pattern, e.g. http://sismo/%slug%/%sha%
      */
     public function __construct($apikey, $repo, $targetUrlPattern = null)
@@ -53,7 +53,7 @@ public function __construct($apikey, $repo, $targetUrlPattern = null)
     }
 
     /**
-     * @param string $context
+     * @param  string $context
      * @return $this
      */
     public function setContext($context)
@@ -64,7 +64,7 @@ public function setContext($context)
     }
 
     /**
-     * @param string $description
+     * @param  string $description
      * @return $this
      */
     public function setDescription($description)
@@ -75,7 +75,7 @@ public function setDescription($description)
     }
 
     /**
-     * @param string $host
+     * @param  string $host
      * @return $this
      */
     public function setHost($host)
@@ -86,7 +86,7 @@ public function setHost($host)
     }
 
     /**
-     * @param string $targetUrlPattern
+     * @param  string $targetUrlPattern
      * @return $this
      */
     public function setTargetUrlPattern($targetUrlPattern)
@@ -116,7 +116,7 @@ public function notify(Commit $commit)
     }
 
     /**
-     * @param Commit $commit
+     * @param  Commit $commit
      * @return string
      */
     protected function getStatusEndpointUrl(Commit $commit)
@@ -125,7 +125,7 @@ protected function getStatusEndpointUrl(Commit $commit)
     }
 
     /**
-     * @param Commit $commit
+     * @param  Commit $commit
      * @return string
      */
     protected function getGitHubState(Commit $commit)
@@ -156,7 +156,7 @@ protected function getGitHubHeaders()
     /**
      * @param $url
      * @param $data
-     * @param array $headers
+     * @param  array $headers
      * @return bool
      */
     protected function request($url, $data, array $headers = array())