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

Update to String package 1.3 #6600

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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;
}