tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Partial revert #7665 - undo changes to thirdparty dir

Browse Source
This commit is contained in:
Daniel Hensby 2018-02-09 18:43:02 +00:00
parent 747a98a07f
commit 5d00d28b2f
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thirdparty/Zend/Currency.php vendored
View File

@ -850,7 +850,7 @@ class Zend_Currency
if (!is_string($value) || (strpos($value, '0') === false)) { if (!is_string($value) || (strpos($value, '0') === false)) {
require_once 'Zend/Currency/Exception.php'; require_once 'Zend/Currency/Exception.php';
throw new Zend_Currency_Exception("'" . throw new Zend_Currency_Exception("'" .
((gettype($value) === 'SS_Object') ? get_class($value) : $value) ((gettype($value) === 'object') ? get_class($value) : $value)
. "' is no format token"); . "' is no format token");
} }
} }

6
thirdparty/Zend/Loader/Autoloader.php vendored
View File

@ -371,7 +371,7 @@ class Zend_Loader_Autoloader
/** /**
* Add an autoloader to the beginning of the stack * Add an autoloader to the beginning of the stack
* *
* @param SS_Object|array|string $callback PHP callback or Zend_Loader_Autoloader_Interface implementation * @param object|array|string $callback PHP callback or Zend_Loader_Autoloader_Interface implementation
* @param string|array $namespace Specific namespace(s) under which to register callback * @param string|array $namespace Specific namespace(s) under which to register callback
* @return Zend_Loader_Autoloader * @return Zend_Loader_Autoloader
*/ */
@ -394,7 +394,7 @@ class Zend_Loader_Autoloader
/** /**
* Append an autoloader to the autoloader stack * Append an autoloader to the autoloader stack
* *
* @param SS_Object|array|string $callback PHP callback or Zend_Loader_Autoloader_Interface implementation * @param object|array|string $callback PHP callback or Zend_Loader_Autoloader_Interface implementation
* @param string|array $namespace Specific namespace(s) under which to register callback * @param string|array $namespace Specific namespace(s) under which to register callback
* @return Zend_Loader_Autoloader * @return Zend_Loader_Autoloader
*/ */
@ -417,7 +417,7 @@ class Zend_Loader_Autoloader
/** /**
* Remove an autoloader from the autoloader stack * Remove an autoloader from the autoloader stack
* *
* @param SS_Object|array|string $callback PHP callback or Zend_Loader_Autoloader_Interface implementation * @param object|array|string $callback PHP callback or Zend_Loader_Autoloader_Interface implementation
* @param null|string|array $namespace Specific namespace(s) from which to remove autoloader * @param null|string|array $namespace Specific namespace(s) from which to remove autoloader
* @return Zend_Loader_Autoloader * @return Zend_Loader_Autoloader
*/ */

2
thirdparty/Zend/Loader/Autoloader/Resource.php vendored
View File

@ -446,7 +446,7 @@ class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interfac
* *
* @param string $resource * @param string $resource
* @param string $type * @param string $type
* @return SS_Object * @return object
* @throws Zend_Loader_Exception if resource type not specified or invalid * @throws Zend_Loader_Exception if resource type not specified or invalid
*/ */
public function load($resource, $type = null) public function load($resource, $type = null)

2
thirdparty/Zend/Log.php vendored
View File

@ -242,7 +242,7 @@ class Zend_Log
* @param string $type 'writer' of 'filter' * @param string $type 'writer' of 'filter'
* @param mixed $config Zend_Config or Array * @param mixed $config Zend_Config or Array
* @param string $namespace * @param string $namespace
* @return SS_Object * @return object
* @throws Zend_Log_Exception * @throws Zend_Log_Exception
*/ */
protected function _constructFromConfig($type, $config, $namespace) protected function _constructFromConfig($type, $config, $namespace)

6
thirdparty/simpletest/compatibility.php vendored
View File

@ -14,8 +14,8 @@ class SimpleTestCompatibility {
/** /**
* Creates a copy whether in PHP5 or PHP4. * Creates a copy whether in PHP5 or PHP4.
* @param SS_Object $object Thing to copy. * @param object $object Thing to copy.
* @return SS_Object A copy. * @return object A copy.
* @access public * @access public
* @static * @static
*/ */
@ -128,7 +128,7 @@ class SimpleTestCompatibility {
/** /**
* Test to see if an object is a member of a * Test to see if an object is a member of a
* class hiearchy. * class hiearchy.
* @param SS_Object $object Object to test. * @param object $object Object to test.
* @param string $class Root name of hiearchy. * @param string $class Root name of hiearchy.
* @return boolean True if class in hiearchy. * @return boolean True if class in hiearchy.
* @access public * @access public

4
thirdparty/tinymce-spellchecker/classes/utils/JSON.php vendored
View File

@ -4,7 +4,7 @@
* *
* @package MCManager.utils * @package MCManager.utils
* @author Moxiecode * @author Moxiecode
* @copyright Copyright <EFBFBD> 2007, Moxiecode Systems AB, All rights reserved. * @copyright Copyright © 2007, Moxiecode Systems AB, All rights reserved.
*/ */
define('JSON_BOOL', 1); define('JSON_BOOL', 1);
@ -474,7 +474,7 @@ class Moxiecode_JSON {
case 'array': case 'array':
return $this->_encodeArray($input); return $this->_encodeArray($input);
case 'SS_Object': case 'object':
return $this->_encodeArray(get_object_vars($input)); return $this->_encodeArray(get_object_vars($input));
} }