Skip to content

Update Joomla Filter package to 1.2 with PHP 7 Fixes #1

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 25, 2016
Merged

Update Joomla Filter package to 1.2 with PHP 7 Fixes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 8 additions & 9 deletions composer.lock
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions libraries/vendor/composer/ClassLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@
namespace Composer\Autoload;

/**
* ClassLoader implements a PSR-0 class loader
*
* See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
* ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
*
* $loader = new \Composer\Autoload\ClassLoader();
*
Expand All @@ -39,6 +37,8 @@
*
* @author Fabien Potencier <[email protected]>
* @author Jordi Boggiano <[email protected]>
* @see http://www.php-fig.org/psr/psr-0/
* @see http://www.php-fig.org/psr/psr-4/
*/
class ClassLoader
{
Expand Down Expand Up @@ -147,7 +147,7 @@ public function add($prefix, $paths, $prepend = false)
* appending or prepending to the ones previously set for this namespace.
*
* @param string $prefix The prefix/namespace, with trailing '\\'
* @param array|string $paths The PSR-0 base directories
* @param array|string $paths The PSR-4 base directories
* @param bool $prepend Whether to prepend the directories
*
* @throws \InvalidArgumentException
Expand Down
6 changes: 3 additions & 3 deletions libraries/vendor/composer/autoload_files.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
$baseDir = dirname(dirname($vendorDir));

return array(
$vendorDir . '/ircmaxell/password-compat/lib/password.php',
$vendorDir . '/paragonie/random_compat/lib/random.php',
$vendorDir . '/symfony/polyfill-php56/bootstrap.php',
'e40631d46120a9c38ea139981f8dab26' => $vendorDir . '/ircmaxell/password-compat/lib/password.php',
'5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',
'bd9634f2d41831496de0d3dfe4c94881' => $vendorDir . '/symfony/polyfill-php56/bootstrap.php',
);
12 changes: 8 additions & 4 deletions libraries/vendor/composer/autoload_real.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,19 @@ public static function getLoader()
$loader->register(true);

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

return $loader;
}
}

function composerRequire0efb534ee20646bcb987f4359c38b3aa($file)
function composerRequire0efb534ee20646bcb987f4359c38b3aa($fileIdentifier, $file)
{
require $file;
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
}
}
107 changes: 53 additions & 54 deletions libraries/vendor/composer/installed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,60 +358,6 @@
"joomla"
]
},
{
"name": "joomla/filter",
"version": "1.1.5",
"version_normalized": "1.1.5.0",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/filter.git",
"reference": "ed6d695a81e71508782ab8d711498c684465b041"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/filter/zipball/ed6d695a81e71508782ab8d711498c684465b041",
"reference": "ed6d695a81e71508782ab8d711498c684465b041",
"shasum": ""
},
"require": {
"php": ">=5.3.10"
},
"require-dev": {
"joomla/language": "~1.0",
"joomla/string": "~1.0",
"phpunit/phpunit": "4.*",
"squizlabs/php_codesniffer": "1.*"
},
"suggest": {
"joomla/language": "Required only if you want to use `OutputFilter::stringURLSafe`.",
"joomla/string": "Required only if you want to use `OutputFilter::stringURLSafe` and `OutputFilter::stringURLUnicodeSlug`."
},
"time": "2014-12-12 21:46:44",
"type": "joomla-package",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
"Joomla\\Filter\\": "src/",
"Joomla\\Filter\\Tests\\": "Tests/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"description": "Joomla Filter Package",
"homepage": "https://github.com/joomla-framework/filter",
"keywords": [
"filter",
"framework",
"joomla"
]
},
{
"name": "joomla/compat",
"version": "1.2.0",
Expand Down Expand Up @@ -925,5 +871,58 @@
"portable",
"shim"
]
},
{
"name": "joomla/filter",
"version": "1.2.0",
"version_normalized": "1.2.0.0",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/filter.git",
"reference": "45a504f0cd6fa2312a0260955e957435ca2cedc9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/filter/zipball/45a504f0cd6fa2312a0260955e957435ca2cedc9",
"reference": "45a504f0cd6fa2312a0260955e957435ca2cedc9",
"shasum": ""
},
"require": {
"joomla/string": "~1.3",
"php": ">=5.3.10"
},
"require-dev": {
"joomla/language": "~1.0",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I missed this line before merging as I was a little more focused on the input filter side. So, shouldn't the Joomla\Language\Language package be included in the required area rather than the required-dev now that use Joomla\Language\Language; is part of the output filter? If that's right wouldn't the Joomla\Language\Language package also need to be added to the CMS?

It seems if you actually try to use the Framework library output filter in the CMS you get a fatal error for the missing class ... {found while attempting to extend the JOutputFilter class in the CMS from the Framework class}

"phpunit/phpunit": "4.*",
"squizlabs/php_codesniffer": "1.*"
},
"suggest": {
"joomla/language": "Required only if you want to use `OutputFilter::stringURLSafe`."
},
"time": "2016-01-08 17:27:47",
"type": "joomla-package",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
"Joomla\\Filter\\": "src/",
"Joomla\\Filter\\Tests\\": "Tests/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"description": "Joomla Filter Package",
"homepage": "https://github.com/joomla-framework/filter",
"keywords": [
"filter",
"framework",
"joomla"
]
}
]
Loading