Skip to content

Commit c798ad5

Browse files
luigifabspinsch
luigifab
authored and
spinsch
committed
Trim trailing whitespace (OpenMage#1846)
1 parent 838e84c commit c798ad5

File tree

229 files changed

+2451
-2451
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

229 files changed

+2451
-2451
lines changed

‎lib/Zend/Amf/Parse/Amf3/Deserializer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,6 @@ public function readXmlString()
420420
$xmlReference = $this->readInteger();
421421
$length = $xmlReference >> 1;
422422
$string = $this->_stream->readBytes($length);
423-
return Zend_Xml_Security::scan($string);
423+
return Zend_Xml_Security::scan($string);
424424
}
425425
}

‎lib/Zend/Amf/Parse/Amf3/Serializer.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,8 @@ public function writeString(&$string)
236236
return $this;
237237
}
238238

239-
$ref = array_key_exists($string, $this->_referenceStrings)
240-
? $this->_referenceStrings[$string]
239+
$ref = array_key_exists($string, $this->_referenceStrings)
240+
? $this->_referenceStrings[$string]
241241
: false;
242242
if ($ref === false){
243243
$this->_referenceStrings[$string] = count($this->_referenceStrings);
@@ -389,8 +389,8 @@ protected function writeObjectReference(&$object, $objectByVal = false)
389389
}
390390

391391
$hash = spl_object_hash($object);
392-
$ref = array_key_exists($hash, $this->_referenceObjects)
393-
? $this->_referenceObjects[$hash]
392+
$ref = array_key_exists($hash, $this->_referenceObjects)
393+
? $this->_referenceObjects[$hash]
394394
: false;
395395

396396
// quickly handle object references

‎lib/Zend/Amf/Server.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public function __construct()
142142
/**
143143
* Set authentication adapter
144144
*
145-
* If the authentication adapter implements a "getAcl()" method, populate
145+
* If the authentication adapter implements a "getAcl()" method, populate
146146
* the ACL of this instance with it (if none exists already).
147147
*
148148
* @param Zend_Amf_Auth_Abstract $auth
@@ -506,7 +506,7 @@ protected function _handle(Zend_Amf_Request $request)
506506
// Authenticate, if we have credential headers
507507
$error = false;
508508
$headers = $request->getAmfHeaders();
509-
if (isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER])
509+
if (isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER])
510510
&& isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->userid)
511511
&& isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->password)
512512
) {
@@ -530,8 +530,8 @@ protected function _handle(Zend_Amf_Request $request)
530530
} catch (Exception $e) {
531531
// Error during authentication; report it
532532
$error = $this->_errorMessage(
533-
$objectEncoding,
534-
'',
533+
$objectEncoding,
534+
'',
535535
$e->getMessage(),
536536
$e->getTraceAsString(),
537537
$e->getCode(),
@@ -970,9 +970,9 @@ public function listMethods()
970970
*
971971
* Takes the provided parameters from the request, and attempts to cast them
972972
* to objects, if the prototype defines any as explicit object types
973-
*
974-
* @param Reflection $reflectionMethod
975-
* @param array $params
973+
*
974+
* @param Reflection $reflectionMethod
975+
* @param array $params
976976
* @return array
977977
*/
978978
protected function _castParameters($reflectionMethod, array $params)

‎lib/Zend/Application/Resource/Db.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public function getDbAdapter()
141141
) {
142142
$this->_db = Zend_Db::factory($adapter, $this->getParams());
143143

144-
if ($this->_db instanceof Zend_Db_Adapter_Abstract
144+
if ($this->_db instanceof Zend_Db_Adapter_Abstract
145145
&& $this->isDefaultTableAdapter()
146146
) {
147147
Zend_Db_Table::setDefaultAdapter($this->_db);

‎lib/Zend/Application/Resource/Frontcontroller.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public function init()
143143
if (!isset($value['params'])) {
144144
$value['params'] = array();
145145
}
146-
146+
147147
$dispatchClass = $value['class'];
148148
if (!class_exists($dispatchClass)) {
149149
#require_once 'Zend/Application/Exception.php';

‎lib/Zend/Application/Resource/Useragent.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class Zend_Application_Resource_UserAgent extends Zend_Application_Resource_Reso
3232
* @var Zend_Http_UserAgent
3333
*/
3434
protected $_userAgent;
35-
35+
3636
/**
3737
* Intialize resource
3838
*
@@ -54,7 +54,7 @@ public function init()
5454

5555
return $userAgent;
5656
}
57-
57+
5858
/**
5959
* Get UserAgent instance
6060
*
@@ -66,7 +66,7 @@ public function getUserAgent()
6666
$options = $this->getOptions();
6767
$this->_userAgent = new Zend_Http_UserAgent($options);
6868
}
69-
69+
7070
return $this->_userAgent;
7171
}
7272
}

‎lib/Zend/Cache/Backend/TwoLevels.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class Zend_Cache_Backend_TwoLevels extends Zend_Cache_Backend implements Zend_Ca
7676
* - If true, automatically fill the fast cache when a cache record was not found in fast cache, but did
7777
* exist in slow cache. This can be usefull when a non-persistent cache like APC or Memcached got
7878
* purged for whatever reason.
79-
*
79+
*
8080
* =====> (boolean) auto_refresh_fast_cache
8181
* - If true, auto refresh the fast cache when a cache record is hit
8282
*
@@ -238,7 +238,7 @@ public function load($id, $doNotTestCacheValidity = false)
238238
}
239239
}
240240
$array = $resultFast !== false ? unserialize($resultFast) : unserialize($resultSlow);
241-
241+
242242
//In case no cache entry was found in the FastCache and auto-filling is enabled, copy data to FastCache
243243
if ($resultFast === false && $this->_options['auto_fill_fast_cache']) {
244244
$preparedData = $this->_prepareData($array['data'], $array['lifetime'], $array['priority']);

‎lib/Zend/Captcha/Dumb.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class Zend_Captcha_Dumb extends Zend_Captcha_Word
4141
* @type string
4242
*/
4343
protected $_label = 'Please type this word backwards';
44-
44+
4545
/**
4646
* Set the label for the CAPTCHA
4747
* @param string $label
@@ -50,7 +50,7 @@ public function setLabel($label)
5050
{
5151
$this->_label = $label;
5252
}
53-
53+
5454
/**
5555
* Retrieve the label for the CAPTCHA
5656
* @return string

‎lib/Zend/Captcha/Word.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ public function setUseNumbers($_useNumbers)
250250
$this->_useNumbers = $_useNumbers;
251251
return $this;
252252
}
253-
253+
254254
/**
255255
* Get session object
256256
*

‎lib/Zend/Cloud/Infrastructure/Adapter.php‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99

1010
/**
1111
* Adapter interface for infrastructure service
12-
*
12+
*
1313
* @package Zend_Cloud
1414
* @subpackage Infrastructure
1515
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
1616
* @license http://framework.zend.com/license/new-bsd New BSD License
1717
*/
18-
interface Zend_Cloud_Infrastructure_Adapter
19-
{
20-
const HTTP_ADAPTER = 'http_adapter';
18+
interface Zend_Cloud_Infrastructure_Adapter
19+
{
20+
const HTTP_ADAPTER = 'http_adapter';
2121

2222
/**
2323
* The max. amount of time, in seconds, to wait for a status change
@@ -33,135 +33,135 @@ interface Zend_Cloud_Infrastructure_Adapter
3333
* Return a list of the available instances
3434
*
3535
* @return InstanceList
36-
*/
37-
public function listInstances();
38-
36+
*/
37+
public function listInstances();
38+
3939
/**
4040
* Return the status of an instance
4141
*
4242
* @param string $id
4343
* @return string
44-
*/
45-
public function statusInstance($id);
44+
*/
45+
public function statusInstance($id);
4646

4747
/**
4848
* Wait for status $status with a timeout of $timeout seconds
49-
*
49+
*
5050
* @param string $id
5151
* @param string $status
52-
* @param integer $timeout
52+
* @param integer $timeout
5353
* @return boolean
5454
*/
5555
public function waitStatusInstance($id, $status, $timeout = self::TIMEOUT_STATUS_CHANGE);
56-
56+
5757
/**
5858
* Return the public DNS name of the instance
59-
*
59+
*
6060
* @param string $id
61-
* @return string|boolean
61+
* @return string|boolean
6262
*/
6363
public function publicDnsInstance($id);
64-
64+
6565
/**
6666
* Reboot an instance
6767
*
6868
* @param string $id
6969
* @return boolean
70-
*/
71-
public function rebootInstance($id);
72-
70+
*/
71+
public function rebootInstance($id);
72+
7373
/**
7474
* Create a new instance
7575
*
7676
* @param string $name
7777
* @param array $options
7878
* @return boolean
79-
*/
80-
public function createInstance($name, $options);
81-
79+
*/
80+
public function createInstance($name, $options);
81+
8282
/**
8383
* Stop the execution of an instance
8484
*
8585
* @param string $id
8686
* @return boolean
87-
*/
88-
public function stopInstance($id);
89-
87+
*/
88+
public function stopInstance($id);
89+
9090
/**
9191
* Start the execution of an instance
9292
*
9393
* @param string $id
9494
* @return boolean
95-
*/
96-
public function startInstance($id);
97-
95+
*/
96+
public function startInstance($id);
97+
9898
/**
9999
* Destroy an instance
100100
*
101101
* @param string $id
102102
* @return boolean
103-
*/
104-
public function destroyInstance($id);
105-
103+
*/
104+
public function destroyInstance($id);
105+
106106
/**
107107
* Return all the available instances images
108108
*
109109
* @return ImageList
110-
*/
111-
public function imagesInstance();
112-
110+
*/
111+
public function imagesInstance();
112+
113113
/**
114114
* Return all the available zones
115-
*
115+
*
116116
* @return array
117117
*/
118118
public function zonesInstance();
119-
119+
120120
/**
121121
* Return the system informations about the $metric of an instance
122122
*
123123
* @param string $id
124124
* @param string $metric
125125
* @param array $options
126126
* @return array
127-
*/
128-
public function monitorInstance($id, $metric, $options = null);
129-
127+
*/
128+
public function monitorInstance($id, $metric, $options = null);
129+
130130
/**
131131
* Run arbitrary shell script on an instance
132132
*
133133
* @param string $id
134134
* @param array $param
135135
* @param string|array $cmd
136136
* @return string|array
137-
*/
137+
*/
138138
public function deployInstance($id, $param, $cmd);
139-
139+
140140
/**
141141
* Get the adapter instance
142-
*
142+
*
143143
* @return object
144144
*/
145145
public function getAdapter();
146-
146+
147147
/**
148148
* Get the adapter result
149-
*
149+
*
150150
* @return array
151151
*/
152152
public function getAdapterResult();
153-
153+
154154
/**
155155
* Get the last HTTP response
156-
*
156+
*
157157
* @return Zend_Http_Response
158158
*/
159159
public function getLastHttpResponse();
160-
160+
161161
/**
162162
* Get the last HTTP request
163-
*
163+
*
164164
* @return string
165165
*/
166166
public function getLastHttpRequest();
167-
}
167+
}

0 commit comments

Comments
 (0)