ForkNetwork / guzzle3

phing/tasks/GuzzlePearPharPackageTask.php

Doc Comments +4 added lines

@@ -215,6 +215,10 @@
         }
     }
 
+    /**
+     * @param string $dir
+     * @param string $baseinstalldir
+     */
     public function buildSubPackage($dir, $baseinstalldir, $info)
     {
         $package = str_replace('/', '_', $baseinstalldir);

Spacing +15 added lines, -15 removed lines

@@ -58,12 +58,12 @@ 
     {
         $this->basedir = $this->getProject()->getBasedir();
 
-        if (!is_dir((string) $this->basedir.'/.subsplit')) {
+        if (!is_dir((string) $this->basedir . '/.subsplit')) {
             throw new BuildException('PEAR packaging requires .subsplit directory');
         }
 
         // main composer file
-        $composer_file = file_get_contents((string) $this->basedir.'/.subsplit/composer.json');
+        $composer_file = file_get_contents((string) $this->basedir . '/.subsplit/composer.json');
         $this->guzzleinfo = json_decode($composer_file, true);
 
         // make sure we have a target
@@ -188,14 +188,14 @@ 
             // load up package file and build package
             $packager = new PEAR_Packager();
             echo "\n\n\nBUILDING PACKAGE FROM PACKAGE FILE:\n";
-            $dest_package = $packager->package($opts['packagedirectory'].'package.xml');
+            $dest_package = $packager->package($opts['packagedirectory'] . 'package.xml');
             var_dump($dest_package);
         } else {
             echo "\n\n\nDEBUGGING RESULT:\n";
             var_dump($result);
         }
         echo "removing package.xml";
-        unlink($opts['packagedirectory'].'package.xml');
+        unlink($opts['packagedirectory'] . 'package.xml');
         $log = ob_get_clean();
         file_put_contents((string) $this->basedir . '/build/artifacts/logs/pear_package.log', $log);
         chdir($startdir);
@@ -207,8 +207,8 @@ 
 
         foreach ($this->subpackages as $package) {
             $baseinstalldir = dirname($package);
-            $dir = (string) $this->basedir.'/.subsplit/src/' . $baseinstalldir;
-            $composer_file = file_get_contents((string) $this->basedir.'/.subsplit/src/'. $package);
+            $dir = (string) $this->basedir . '/.subsplit/src/' . $baseinstalldir;
+            $composer_file = file_get_contents((string) $this->basedir . '/.subsplit/src/' . $package);
             $package_info = json_decode($composer_file, true);
             $this->log('building ' . $package_info['target-dir'] . ' subpackage');
             $this->buildSubPackage($dir, $baseinstalldir, $package_info);
@@ -282,23 +282,23 @@ 
             // load up package file and build package
             $packager = new PEAR_Packager();
             echo "\n\n\nBUILDING PACKAGE FROM PACKAGE FILE:\n";
-            $dest_package = $packager->package($opts['packagedirectory'].'/package.xml');
+            $dest_package = $packager->package($opts['packagedirectory'] . '/package.xml');
             var_dump($dest_package);
         } else {
             echo "\n\n\nDEBUGGING RESULT:\n";
             var_dump($result);
         }
         echo "removing package.xml";
-        unlink($opts['packagedirectory'].'/package.xml');
+        unlink($opts['packagedirectory'] . '/package.xml');
         $log = ob_get_clean();
-        file_put_contents((string) $this->basedir . '/build/artifacts/logs/pear_package_'.$package.'.log', $log);
+        file_put_contents((string) $this->basedir . '/build/artifacts/logs/pear_package_' . $package . '.log', $log);
         chdir($startdir);
     }
 
     public function findComponents()
     {
         $ds = new DirectoryScanner();
-        $ds->setBasedir((string) $this->basedir.'/.subsplit/src');
+        $ds->setBasedir((string) $this->basedir . '/.subsplit/src');
         $ds->setIncludes(array('**/composer.json'));
         $ds->scan();
         $files = $ds->getIncludedFiles();
@@ -307,14 +307,14 @@ 
 
     public function grabChangelog()
     {
-        $cl = file((string) $this->basedir.'/.subsplit/CHANGELOG.md');
+        $cl = file((string) $this->basedir . '/.subsplit/CHANGELOG.md');
         $notes = '';
         $in_version = false;
         $release_date = null;
 
         foreach ($cl as $line) {
             $line = trim($line);
-            if (preg_match('/^\* '.$this->getVersion().' \(([0-9\-]+)\)$/', $line, $matches)) {
+            if (preg_match('/^\* ' . $this->getVersion() . ' \(([0-9\-]+)\)$/', $line, $matches)) {
                 $release_date = $matches[1];
                 $in_version = true;
                 continue;
@@ -322,8 +322,8 @@ 
             if ($in_version && empty($line) && empty($notes)) {
                 continue;
             }
-            if ($in_version && ! empty($line)) {
-                $notes .= $line."\n";
+            if ($in_version && !empty($line)) {
+                $notes .= $line . "\n";
             }
             if ($in_version && empty($line) && !empty($notes)) {
                 $in_version = false;
@@ -331,7 +331,7 @@ 
         }
         $this->changelog_release_date = $release_date;
 
-        if (! empty($notes)) {
+        if (!empty($notes)) {
             $this->changelog_notes = $notes;
         }
     }

phing/tasks/GuzzleSubSplitTask.php

Doc Comments +3 added lines

@@ -94,6 +94,9 @@
         $this->base = $str;
     }
 
+    /**
+     * @return string
+     */
     public function getBase()
     {
         return $this->base;

Spacing +10 added lines, -10 removed lines

@@ -142,7 +142,7 @@ 
     /**
      * GitClient from VersionControl_Git
      */
-    protected $client   = null;
+    protected $client = null;
 
     /**
      * The main entry point
@@ -192,7 +192,7 @@ 
         $heads = $this->getHeads();
         foreach ($heads as $head) {
             foreach ($this->splits[$head] as $component => $meta) {
-                $splits[] = $base . $component . ':git@github.com:'. $org.'/'.$meta['repo'];
+                $splits[] = $base . $component . ':git@github.com:' . $org . '/' . $meta['repo'];
             }
 
             $cmd = 'git subsplit publish ';
@@ -201,7 +201,7 @@ 
             if ($this->getNoHeads()) {
                 $cmd .= ' --no-heads';
             } else {
-                $cmd .= ' --heads='.$head;
+                $cmd .= ' --heads=' . $head;
             }
 
             if ($this->getNoTags()) {
@@ -228,7 +228,7 @@ 
         try {
             $cmd->execute();
         } catch (Exception $e) {
-            throw new BuildException('git subsplit update failed'. $e);
+            throw new BuildException('git subsplit update failed' . $e);
         }
         chdir($repo . '/.subsplit');
         passthru('php ../composer.phar update --dev');
@@ -252,7 +252,7 @@ 
         try {
             $output = $cmd->execute();
         } catch (Exception $e) {
-            throw new BuildException('git subsplit init failed'. $e);
+            throw new BuildException('git subsplit init failed' . $e);
         }
         $this->log(trim($output), Project::MSG_INFO);
         $repo = $this->getRepository();
@@ -289,13 +289,13 @@ 
             passthru("git checkout '$head'");
             $ds = new DirectoryScanner();
             $ds->setBasedir($repo . '/.subsplit' . $base);
-            $ds->setIncludes(array('**/'.$this->subIndicatorFile));
+            $ds->setIncludes(array('**/' . $this->subIndicatorFile));
             $ds->scan();
             $files = $ds->getIncludedFiles();
 
             // Process the files we found
             foreach ($files as $file) {
-                $pkg = file_get_contents($repo . '/.subsplit' . $base .'/'. $file);
+                $pkg = file_get_contents($repo . '/.subsplit' . $base . '/' . $file);
                 $pkg_json = json_decode($pkg, true);
                 $name = $pkg_json['name'];
                 $component = str_replace('/composer.json', '', $file);
@@ -330,7 +330,7 @@ 
             return;
         }
 
-        $ch = curl_init('https://api.github.com/orgs/'.$github_org.'/repos?type=all');
+        $ch = curl_init('https://api.github.com/orgs/' . $github_org . '/repos?type=all');
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($ch, CURLOPT_USERPWD, $github_creds);
         // change this when we know we can use our bundled CA bundle!
@@ -365,7 +365,7 @@ 
                         'has_downloads' => true,
                         'auto_init' => false
                     );
-                    $ch = curl_init('https://api.github.com/orgs/'.$github_org.'/repos');
+                    $ch = curl_init('https://api.github.com/orgs/' . $github_org . '/repos');
                     curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
                     curl_setopt($ch, CURLOPT_USERPWD, $github_creds);
                     curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json'));
@@ -374,7 +374,7 @@ 
                     // change this when we know we can use our bundled CA bundle!
                     curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
                     $result = curl_exec($ch);
-                    echo "Response code: ".curl_getinfo($ch, CURLINFO_HTTP_CODE)."\n";
+                    echo "Response code: " . curl_getinfo($ch, CURLINFO_HTTP_CODE) . "\n";
                     curl_close($ch);
                 } else {
                     $this->log("Repo $reponame exists", 2);

src/Guzzle/Batch/AbstractBatchDecorator.php

Doc Comments +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
     /**
      * Trace the decorators associated with the batch
      *
-     * @return array
+     * @return AbstractBatchDecorator[]
      */
     public function getDecorators()
     {

src/Guzzle/Batch/BatchBuilder.php

Doc Comments +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
     /**
      * Automatically flush the batch when the size of the queue reaches a certain threshold. Adds {@see FlushingBatch}.
      *
-     * @param $threshold Number of items to allow in the queue before a flush
+     * @param integer $threshold Number of items to allow in the queue before a flush
      *
      * @return BatchBuilder
      */

src/Guzzle/Common/Collection.php

Doc Comments +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
      *
      * @param array $config   Configuration values to apply.
      * @param array $defaults Default parameters
-     * @param array $required Required parameter names
+     * @param string[] $required Required parameter names
      *
      * @return self
      * @throws InvalidArgumentException if a parameter is missing

Spacing +5 added lines, -5 removed lines

@@ -322,7 +322,7 @@ 
      */
     public function setPath($path, $value)
     {
-        $current =& $this->data;
+        $current = & $this->data;
         $queue = explode('/', $path);
         while (null !== ($key = array_shift($queue))) {
             if (!is_array($current)) {
@@ -330,10 +330,10 @@ 
             } elseif (!$queue) {
                 $current[$key] = $value;
             } elseif (isset($current[$key])) {
-                $current =& $current[$key];
+                $current = & $current[$key];
             } else {
                 $current[$key] = array();
-                $current =& $current[$key];
+                $current = & $current[$key];
             }
         }
 
@@ -354,7 +354,7 @@ 
     public function getPath($path, $separator = '/', $data = null)
     {
         if ($data === null) {
-            $data =& $this->data;
+            $data = & $this->data;
         }
 
         $path = is_array($path) ? $path : explode($separator, $path);
@@ -362,7 +362,7 @@ 
             if (!is_array($data)) {
                 return null;
             } elseif (isset($data[$part])) {
-                $data =& $data[$part];
+                $data = & $data[$part];
             } elseif ($part != '*') {
                 return null;
             } else {

src/Guzzle/Http/EntityBody.php

Doc Comments +3 added lines

@@ -165,6 +165,9 @@
         )) ?: false;
     }
 
+    /**
+     * @param string $filter
+     */
     protected function handleCompression($filter, $offsetStart = 0)
     {
         // @codeCoverageIgnoreStart

src/Guzzle/Http/Message/Header.php

Doc Comments +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 
     /**
      * @param string       $header Name of the header
-     * @param array|string $values Values of the header as an array or a scalar
+     * @param string|null $values Values of the header as an array or a scalar
      * @param string       $glue   Glue used to combine multiple values into a string
      */
     public function __construct($header, $values = array(), $glue = ',')

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
 
     public function removeValue($searchValue)
     {
-        $this->values = array_values(array_filter($this->values, function ($value) use ($searchValue) {
+        $this->values = array_values(array_filter($this->values, function($value) use ($searchValue) {
             return $value != $searchValue;
         }));
 

src/Guzzle/Http/Message/RequestInterface.php

Doc Comments -1 removed lines

@@ -62,7 +62,6 @@
     /**
      * Set the URL of the request
      *
-     * @param string $url|Url Full URL to set including query string
      *
      * @return self
      */

src/Guzzle/Http/Message/Response.php

Doc Comments +5 added lines, -5 removed lines

@@ -190,7 +190,7 @@ 
     /**
      * Set the response entity body
      *
-     * @param EntityBodyInterface|string $body Body to set
+     * @param string $body Body to set
      *
      * @return self
      */
@@ -296,7 +296,7 @@ 
     /**
      * Get the response status code
      *
-     * @return integer
+     * @return string
      */
     public function getStatusCode()
     {
@@ -377,7 +377,7 @@ 
     /**
      * Get the Age HTTP header
      *
-     * @return integer|null Returns the age the object has been in a proxy cache in seconds.
+     * @return string Returns the age the object has been in a proxy cache in seconds.
      */
     public function getAge()
     {
@@ -583,7 +583,7 @@ 
     /**
      * Get the Pragma HTTP header
      *
-     * @return Header|null Returns the implementation-specific headers that may have various effects anywhere along
+     * @return string Returns the implementation-specific headers that may have various effects anywhere along
      *                     the request-response chain.
      */
     public function getPragma()
@@ -604,7 +604,7 @@ 
     /**
      * Get the Retry-After HTTP header
      *
-     * @return int|null If an entity is temporarily unavailable, this instructs the client to try again after a
+     * @return string If an entity is temporarily unavailable, this instructs the client to try again after a
      *                  specified period of time.
      */
     public function getRetryAfter()

Indentation +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
 
         $response = new static($data['code'], $data['headers'], $data['body']);
         $response->setProtocol($data['protocol'], $data['version'])
-                 ->setStatus($data['code'], $data['reason_phrase']);
+                    ->setStatus($data['code'], $data['reason_phrase']);
 
         // Set the appropriate Content-Length if the one set is inaccurate (e.g. setting to X)
         $contentLength = (string) $response->getHeader('Content-Length');

Spacing +1 added lines, -1 removed lines

@@ -619,7 +619,7 @@
      */
     public function getServer()
     {
-        return (string)  $this->getHeader('Server');
+        return (string) $this->getHeader('Server');
     }
 
     /**