Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trim trailing whitespace #1846

Merged
merged 1 commit into from
Oct 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Zend/Amf/Parse/Amf3/Deserializer.php
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,6 @@ public function readXmlString()
$xmlReference = $this->readInteger();
$length = $xmlReference >> 1;
$string = $this->_stream->readBytes($length);
return Zend_Xml_Security::scan($string);
return Zend_Xml_Security::scan($string);
}
}
8 changes: 4 additions & 4 deletions lib/Zend/Amf/Parse/Amf3/Serializer.php
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,8 @@ public function writeString(&$string)
return $this;
}

$ref = array_key_exists($string, $this->_referenceStrings)
? $this->_referenceStrings[$string]
$ref = array_key_exists($string, $this->_referenceStrings)
? $this->_referenceStrings[$string]
: false;
if ($ref === false){
$this->_referenceStrings[$string] = count($this->_referenceStrings);
Expand Down Expand Up @@ -389,8 +389,8 @@ protected function writeObjectReference(&$object, $objectByVal = false)
}

$hash = spl_object_hash($object);
$ref = array_key_exists($hash, $this->_referenceObjects)
? $this->_referenceObjects[$hash]
$ref = array_key_exists($hash, $this->_referenceObjects)
? $this->_referenceObjects[$hash]
: false;

// quickly handle object references
Expand Down
14 changes: 7 additions & 7 deletions lib/Zend/Amf/Server.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public function __construct()
/**
* Set authentication adapter
*
* If the authentication adapter implements a "getAcl()" method, populate
* If the authentication adapter implements a "getAcl()" method, populate
* the ACL of this instance with it (if none exists already).
*
* @param Zend_Amf_Auth_Abstract $auth
Expand Down Expand Up @@ -506,7 +506,7 @@ protected function _handle(Zend_Amf_Request $request)
// Authenticate, if we have credential headers
$error = false;
$headers = $request->getAmfHeaders();
if (isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER])
if (isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER])
&& isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->userid)
&& isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->password)
) {
Expand All @@ -530,8 +530,8 @@ protected function _handle(Zend_Amf_Request $request)
} catch (Exception $e) {
// Error during authentication; report it
$error = $this->_errorMessage(
$objectEncoding,
'',
$objectEncoding,
'',
$e->getMessage(),
$e->getTraceAsString(),
$e->getCode(),
Expand Down Expand Up @@ -970,9 +970,9 @@ public function listMethods()
*
* Takes the provided parameters from the request, and attempts to cast them
* to objects, if the prototype defines any as explicit object types
*
* @param Reflection $reflectionMethod
* @param array $params
*
* @param Reflection $reflectionMethod
* @param array $params
* @return array
*/
protected function _castParameters($reflectionMethod, array $params)
Expand Down
2 changes: 1 addition & 1 deletion lib/Zend/Application/Resource/Db.php
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public function getDbAdapter()
) {
$this->_db = Zend_Db::factory($adapter, $this->getParams());

if ($this->_db instanceof Zend_Db_Adapter_Abstract
if ($this->_db instanceof Zend_Db_Adapter_Abstract
&& $this->isDefaultTableAdapter()
) {
Zend_Db_Table::setDefaultAdapter($this->_db);
Expand Down
2 changes: 1 addition & 1 deletion lib/Zend/Application/Resource/Frontcontroller.php
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public function init()
if (!isset($value['params'])) {
$value['params'] = array();
}

$dispatchClass = $value['class'];
if (!class_exists($dispatchClass)) {
#require_once 'Zend/Application/Exception.php';
Expand Down
6 changes: 3 additions & 3 deletions lib/Zend/Application/Resource/Useragent.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Zend_Application_Resource_UserAgent extends Zend_Application_Resource_Reso
* @var Zend_Http_UserAgent
*/
protected $_userAgent;

/**
* Intialize resource
*
Expand All @@ -54,7 +54,7 @@ public function init()

return $userAgent;
}

/**
* Get UserAgent instance
*
Expand All @@ -66,7 +66,7 @@ public function getUserAgent()
$options = $this->getOptions();
$this->_userAgent = new Zend_Http_UserAgent($options);
}

return $this->_userAgent;
}
}
4 changes: 2 additions & 2 deletions lib/Zend/Cache/Backend/TwoLevels.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class Zend_Cache_Backend_TwoLevels extends Zend_Cache_Backend implements Zend_Ca
* - If true, automatically fill the fast cache when a cache record was not found in fast cache, but did
* exist in slow cache. This can be usefull when a non-persistent cache like APC or Memcached got
* purged for whatever reason.
*
*
* =====> (boolean) auto_refresh_fast_cache
* - If true, auto refresh the fast cache when a cache record is hit
*
Expand Down Expand Up @@ -238,7 +238,7 @@ public function load($id, $doNotTestCacheValidity = false)
}
}
$array = $resultFast !== false ? unserialize($resultFast) : unserialize($resultSlow);

//In case no cache entry was found in the FastCache and auto-filling is enabled, copy data to FastCache
if ($resultFast === false && $this->_options['auto_fill_fast_cache']) {
$preparedData = $this->_prepareData($array['data'], $array['lifetime'], $array['priority']);
Expand Down
4 changes: 2 additions & 2 deletions lib/Zend/Captcha/Dumb.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class Zend_Captcha_Dumb extends Zend_Captcha_Word
* @type string
*/
protected $_label = 'Please type this word backwards';

/**
* Set the label for the CAPTCHA
* @param string $label
Expand All @@ -50,7 +50,7 @@ public function setLabel($label)
{
$this->_label = $label;
}

/**
* Retrieve the label for the CAPTCHA
* @return string
Expand Down
2 changes: 1 addition & 1 deletion lib/Zend/Captcha/Word.php
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ public function setUseNumbers($_useNumbers)
$this->_useNumbers = $_useNumbers;
return $this;
}

/**
* Get session object
*
Expand Down
96 changes: 48 additions & 48 deletions lib/Zend/Cloud/Infrastructure/Adapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@

/**
* Adapter interface for infrastructure service
*
*
* @package Zend_Cloud
* @subpackage Infrastructure
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface Zend_Cloud_Infrastructure_Adapter
{
const HTTP_ADAPTER = 'http_adapter';
interface Zend_Cloud_Infrastructure_Adapter
{
const HTTP_ADAPTER = 'http_adapter';

/**
* The max. amount of time, in seconds, to wait for a status change
Expand All @@ -33,135 +33,135 @@ interface Zend_Cloud_Infrastructure_Adapter
* Return a list of the available instances
*
* @return InstanceList
*/
public function listInstances();
*/
public function listInstances();

/**
* Return the status of an instance
*
* @param string $id
* @return string
*/
public function statusInstance($id);
*/
public function statusInstance($id);

/**
* Wait for status $status with a timeout of $timeout seconds
*
*
* @param string $id
* @param string $status
* @param integer $timeout
* @param integer $timeout
* @return boolean
*/
public function waitStatusInstance($id, $status, $timeout = self::TIMEOUT_STATUS_CHANGE);

/**
* Return the public DNS name of the instance
*
*
* @param string $id
* @return string|boolean
* @return string|boolean
*/
public function publicDnsInstance($id);

/**
* Reboot an instance
*
* @param string $id
* @return boolean
*/
public function rebootInstance($id);
*/
public function rebootInstance($id);

/**
* Create a new instance
*
* @param string $name
* @param array $options
* @return boolean
*/
public function createInstance($name, $options);
*/
public function createInstance($name, $options);

/**
* Stop the execution of an instance
*
* @param string $id
* @return boolean
*/
public function stopInstance($id);
*/
public function stopInstance($id);

/**
* Start the execution of an instance
*
* @param string $id
* @return boolean
*/
public function startInstance($id);
*/
public function startInstance($id);

/**
* Destroy an instance
*
* @param string $id
* @return boolean
*/
public function destroyInstance($id);
*/
public function destroyInstance($id);

/**
* Return all the available instances images
*
* @return ImageList
*/
public function imagesInstance();
*/
public function imagesInstance();

/**
* Return all the available zones
*
*
* @return array
*/
public function zonesInstance();

/**
* Return the system informations about the $metric of an instance
*
* @param string $id
* @param string $metric
* @param array $options
* @return array
*/
public function monitorInstance($id, $metric, $options = null);
*/
public function monitorInstance($id, $metric, $options = null);

/**
* Run arbitrary shell script on an instance
*
* @param string $id
* @param array $param
* @param string|array $cmd
* @return string|array
*/
*/
public function deployInstance($id, $param, $cmd);

/**
* Get the adapter instance
*
*
* @return object
*/
public function getAdapter();

/**
* Get the adapter result
*
*
* @return array
*/
public function getAdapterResult();

/**
* Get the last HTTP response
*
*
* @return Zend_Http_Response
*/
public function getLastHttpResponse();

/**
* Get the last HTTP request
*
*
* @return string
*/
public function getLastHttpRequest();
}
}
Loading