mirror_php/guzzle
1
0
Fork 0
mirror of https://github.com/guzzle/guzzle.git synced 2025-02-25 18:43:22 +01:00
Code Issues Releases Wiki Activity

Merge pull request #523 from GrahamCampbell/minor-fixes

Browse Source 
Minor fixes
This commit is contained in:
Michael Dowling 2014-01-08 15:42:48 -08:00
commit aa70f6a4d1
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phing/tasks/GuzzlePearPharPackageTask.php
View File

@ -13,7 +13,6 @@ require_once 'PEAR/Packager.php';
class GuzzlePearPharPackageTask extends Task
{
private $dir;
private $version;
private $deploy = true;
private $makephar = true;
@ -143,7 +142,7 @@ class GuzzlePearPharPackageTask extends Task
//'outputdirectory' => (string) $this->basedir . '/build/pearwork/'
);
$pfm = new PEAR_PackageFileManager2();
$e = $pfm->setOptions($opts);
$pfm->setOptions($opts);
$pfm->addRole('md', 'doc');
$pfm->addRole('pem', 'php');
$pfm->setPackage('Guzzle');
@ -204,7 +203,6 @@ class GuzzlePearPharPackageTask extends Task
public function createSubPackages()
{
$version = $this->getVersion();
$this->findComponents();
foreach ($this->subpackages as $package) {
@ -228,7 +226,7 @@ class GuzzlePearPharPackageTask extends Task
'packagefile' => 'package.xml'
);
$pfm = new PEAR_PackageFileManager2();
$e = $pfm->setOptions($opts);
$pfm->setOptions($opts);
$pfm->setPackage($package);
$pfm->setSummary($info['description']);
$pfm->setDescription($info['description']);

2
phing/tasks/GuzzleSubSplitTask.php
View File

@ -226,7 +226,7 @@ class GuzzleSubSplitTask extends GitBaseTask
$cmd = $this->client->getCommand('subsplit');
$cmd->addArgument('update');
try {
$output = $cmd->execute();
$cmd->execute();
} catch (Exception $e) {
throw new BuildException('git subsplit update failed'. $e);
}

2
src/Guzzle/Http/Message/RequestFactory.php
View File

@ -138,7 +138,7 @@ class RequestFactory implements RequestFactoryInterface
public function cloneRequestWithMethod(RequestInterface $request, $method)
{
// Create the request with the same client if possible
if ($client = $request->getClient()) {
if ($request->getClient()) {
$cloned = $request->getClient()->createRequest($method, $request->getUrl(), $request->getHeaders());
} else {
$cloned = $this->create($method, $request->getUrl(), $request->getHeaders());

4
src/Guzzle/Stream/PhpStreamRequestFactory.php
View File

@ -147,7 +147,7 @@ class PhpStreamRequestFactory implements StreamRequestFactoryInterface
*/
protected function addSslOptions(RequestInterface $request)
{
if ($verify = $request->getCurlOptions()->get(CURLOPT_SSL_VERIFYPEER)) {
if ($request->getCurlOptions()->get(CURLOPT_SSL_VERIFYPEER)) {
$this->setContextValue('ssl', 'verify_peer', true, true);
if ($cafile = $request->getCurlOptions()->get(CURLOPT_CAINFO)) {
$this->setContextValue('ssl', 'cafile', $cafile, true);
@ -235,7 +235,7 @@ class PhpStreamRequestFactory implements StreamRequestFactoryInterface
{
// Set the size on the stream if it was returned in the response
foreach ($this->lastResponseHeaders as $header) {
if (($pos = stripos($header, 'Content-Length:')) === 0) {
if ((stripos($header, 'Content-Length:')) === 0) {
$stream->setSize(trim(substr($header, 15)));
}
}