Skip to content

Commit

Permalink
Update to String package 1.3. Fixes #6600.
Browse files Browse the repository at this point in the history
PHP7 fixes
  • Loading branch information
wilsonge committed May 14, 2015
1 parent 29c7cff commit 834ad2c
Show file tree
Hide file tree
Showing 37 changed files with 268 additions and 4,374 deletions.
10 changes: 6 additions & 4 deletions composer.json
Expand Up @@ -10,12 +10,14 @@
},
"require": {
"php": ">=5.3.10",
"joomla/application": "~1.2",
"joomla/application": "~1.4",
"joomla/di": "~1.2",
"joomla/registry": "~1.2",
"joomla/string": "~1.2",
"joomla/event": "~1.1",
"joomla/registry": "~1.4 >=1.4.5",
"joomla/session": "~1.2",
"joomla/string": "~1.3",
"joomla/uri": "~1.1",
"joomla/utilities": "~1.3",
"joomla/utilities": "~1.3 >=1.3.3",
"ircmaxell/password-compat": "1.*",
"leafo/lessphp": "0.3.9",
"phpmailer/phpmailer": "5.2.9",
Expand Down
55 changes: 29 additions & 26 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions libraries/joomla/string/string.php
Expand Up @@ -9,17 +9,17 @@

defined('JPATH_PLATFORM') or die;

use Joomla\String\String;
use Joomla\String\StringHelper;

/**
* String handling class for utf-8 data
* Wraps the phputf8 library
* All functions assume the validity of utf-8 strings.
*
* @since 11.1
* @deprecated 4.0 Use {@link \Joomla\String\String} instead unless otherwise noted.
* @deprecated 4.0 Use {@link \Joomla\String\StringHelper} instead unless otherwise noted.
*/
abstract class JString extends String
abstract class JString extends StringHelper
{
/**
* Split a string in camel case format
Expand Down
2 changes: 1 addition & 1 deletion libraries/vendor/autoload.php
Expand Up @@ -4,4 +4,4 @@

require_once __DIR__ . '/composer' . '/autoload_real.php';

return ComposerAutoloaderInitf9aed076f12471aff0049364a504b3f7::getLoader();
return ComposerAutoloaderInit0efb534ee20646bcb987f4359c38b3aa::getLoader();
10 changes: 5 additions & 5 deletions libraries/vendor/composer/autoload_real.php
Expand Up @@ -2,7 +2,7 @@

// autoload_real.php @generated by Composer

class ComposerAutoloaderInitf9aed076f12471aff0049364a504b3f7
class ComposerAutoloaderInit0efb534ee20646bcb987f4359c38b3aa
{
private static $loader;

Expand All @@ -19,9 +19,9 @@ public static function getLoader()
return self::$loader;
}

spl_autoload_register(array('ComposerAutoloaderInitf9aed076f12471aff0049364a504b3f7', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit0efb534ee20646bcb987f4359c38b3aa', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInitf9aed076f12471aff0049364a504b3f7', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit0efb534ee20646bcb987f4359c38b3aa', 'loadClassLoader'));

$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
Expand All @@ -42,14 +42,14 @@ public static function getLoader()

$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
composerRequiref9aed076f12471aff0049364a504b3f7($file);
composerRequire0efb534ee20646bcb987f4359c38b3aa($file);
}

return $loader;
}
}

function composerRequiref9aed076f12471aff0049364a504b3f7($file)
function composerRequire0efb534ee20646bcb987f4359c38b3aa($file)
{
require $file;
}

0 comments on commit 834ad2c

Please sign in to comment.