From 610f84b85a247f2c51758c6d579af2bea69ca358 Mon Sep 17 00:00:00 2001
From: Helmut Hummel <helmut.hummel@typo3.org>
Date: Fri, 7 Aug 2015 00:12:49 +0200
Subject: [PATCH] [TASK] Update to class-alias-loader 2.x
Update to latest refactored version of the class-alias-loader.
This might be the last iteration before this package is moved
to TYPO3 namespace.
The alias loader has been refactored, cleaned up, moved to PSR-2.
Documentation and tests have been added.
Releases: master
Resolves: #68811
Change-Id: Ice960936712b39f095d4398ce342947d09b79153
Reviewed-on: http://review.typo3.org/42336
Reviewed-by: Helmut Hummel <helmut.hummel@typo3.org>
Tested-by: Helmut Hummel <helmut.hummel@typo3.org>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
composer.json | 2 +-
composer.lock | 25 +++++++++++--------
.../backend/Classes/Console/Application.php | 2 +-
.../backend/Classes/Http/Application.php | 2 +-
typo3/sysext/compatibility6/composer.json | 8 +++---
typo3/sysext/core/Classes/Core/Bootstrap.php | 2 +-
.../Classes/Core/ClassLoadingInformation.php | 2 +-
.../frontend/Classes/Http/Application.php | 4 +--
.../install/Classes/Http/Application.php | 2 +-
typo3/sysext/mediace/composer.json | 8 +++---
10 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/composer.json b/composer.json
index be50e621ff37..735b43bc0d62 100644
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,7 @@
"symfony/console": "~2.5.11",
"symfony/finder": "^2.6.9",
"doctrine/instantiator": "~1.0.4",
- "helhum/class-alias-loader": "^1.1.9",
+ "helhum/class-alias-loader": "^2.0.0",
"typo3/cms-composer-installers": "^1.2.2",
"psr/http-message": "~1.0"
},
diff --git a/composer.lock b/composer.lock
index 00de44cc7e98..73525cbd4ca7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "2d3f58d0523e76748072a590be255017",
+ "hash": "67334195c29a2d5cfb17e446317824f6",
"packages": [
{
"name": "doctrine/instantiator",
@@ -62,34 +62,37 @@
},
{
"name": "helhum/class-alias-loader",
- "version": "1.1.10",
+ "version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/helhum/class-alias-loader.git",
- "reference": "a5206c1ccfdaeac401eca76a723bfee06e38a111"
+ "reference": "28e9155b8ab3f2871f32899d4fa355fd14daba95"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/helhum/class-alias-loader/zipball/a5206c1ccfdaeac401eca76a723bfee06e38a111",
- "reference": "a5206c1ccfdaeac401eca76a723bfee06e38a111",
+ "url": "https://api.github.com/repos/helhum/class-alias-loader/zipball/28e9155b8ab3f2871f32899d4fa355fd14daba95",
+ "reference": "28e9155b8ab3f2871f32899d4fa355fd14daba95",
"shasum": ""
},
"require": {
- "composer-plugin-api": "^1.0"
+ "composer-plugin-api": "^1.0",
+ "php": ">=5.3.7"
},
"require-dev": {
- "composer/composer": "dev-master"
+ "composer/composer": "dev-master",
+ "mikey179/vfsstream": "1.4.*@dev",
+ "phpunit/phpunit": "~4.7.0"
},
"type": "composer-plugin",
"extra": {
- "class": "Helhum\\ClassAliasLoader\\Composer\\Plugin",
+ "class": "Helhum\\ClassAliasLoader\\Plugin",
"branch-alias": {
- "dev-master": "1.1.x-dev"
+ "dev-master": "2.0.x-dev"
}
},
"autoload": {
"psr-4": {
- "Helhum\\ClassAliasLoader\\": "Classes/"
+ "Helhum\\ClassAliasLoader\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -110,7 +113,7 @@
"classloader",
"composer"
],
- "time": "2015-07-08 08:08:04"
+ "time": "2015-08-06 22:03:20"
},
{
"name": "pear/http_request2",
diff --git a/typo3/sysext/backend/Classes/Console/Application.php b/typo3/sysext/backend/Classes/Console/Application.php
index 1389a314d302..c86b4535ccd9 100644
--- a/typo3/sysext/backend/Classes/Console/Application.php
+++ b/typo3/sysext/backend/Classes/Console/Application.php
@@ -44,7 +44,7 @@ class Application implements ApplicationInterface {
/**
* Constructor setting up legacy constants and register available Request Handlers
*
- * @param \Composer\Autoload\ClassLoader|\Helhum\ClassAliasLoader\Composer\ClassAliasLoader $classLoader an instance of the class loader
+ * @param \Composer\Autoload\ClassLoader|\Helhum\ClassAliasLoader\ClassAliasLoader $classLoader an instance of the class loader
*/
public function __construct($classLoader) {
$this->checkEnvironmentOrDie();
diff --git a/typo3/sysext/backend/Classes/Http/Application.php b/typo3/sysext/backend/Classes/Http/Application.php
index b43ac7f8677a..3b77c66d24cc 100644
--- a/typo3/sysext/backend/Classes/Http/Application.php
+++ b/typo3/sysext/backend/Classes/Http/Application.php
@@ -50,7 +50,7 @@ class Application implements ApplicationInterface {
/**
* Constructor setting up legacy constant and register available Request Handlers
*
- * @param \Composer\Autoload\ClassLoader|\Helhum\ClassAliasLoader\Composer\ClassAliasLoader $classLoader an instance of the class loader
+ * @param \Composer\Autoload\ClassLoader|\Helhum\ClassAliasLoader\ClassAliasLoader $classLoader an instance of the class loader
*/
public function __construct($classLoader) {
$this->defineLegacyConstants();
diff --git a/typo3/sysext/compatibility6/composer.json b/typo3/sysext/compatibility6/composer.json
index 470bcbff1084..a9a0de4a5ac5 100644
--- a/typo3/sysext/compatibility6/composer.json
+++ b/typo3/sysext/compatibility6/composer.json
@@ -13,9 +13,11 @@
"compatibility6": "*"
},
"extra": {
- "class-alias-maps": [
- "Migrations/Code/ClassAliasMap.php"
- ]
+ "helhum/class-alias-loader": {
+ "class-alias-maps": [
+ "Migrations/Code/ClassAliasMap.php"
+ ]
+ }
},
"autoload": {
"psr-4": {
diff --git a/typo3/sysext/core/Classes/Core/Bootstrap.php b/typo3/sysext/core/Classes/Core/Bootstrap.php
index c6a9db0cd78a..8bdc82df4603 100644
--- a/typo3/sysext/core/Classes/Core/Bootstrap.php
+++ b/typo3/sysext/core/Classes/Core/Bootstrap.php
@@ -192,7 +192,7 @@ class Bootstrap {
/**
* Sets the class loader to the bootstrap
*
- * @param \Composer\Autoload\ClassLoader|\Helhum\ClassAliasLoader\Composer\ClassAliasLoader $classLoader an instance of the class loader
+ * @param \Composer\Autoload\ClassLoader|\Helhum\ClassAliasLoader\ClassAliasLoader $classLoader an instance of the class loader
* @return Bootstrap
* @internal This is not a public API method, do not use in own extensions
*/
diff --git a/typo3/sysext/core/Classes/Core/ClassLoadingInformation.php b/typo3/sysext/core/Classes/Core/ClassLoadingInformation.php
index fa332eeee246..9497304698f7 100644
--- a/typo3/sysext/core/Classes/Core/ClassLoadingInformation.php
+++ b/typo3/sysext/core/Classes/Core/ClassLoadingInformation.php
@@ -15,7 +15,7 @@ namespace TYPO3\CMS\Core\Core;
*/
use Composer\Autoload\ClassLoader as ComposerClassLoader;
-use Helhum\ClassAliasLoader\Composer\ClassAliasLoader;
+use Helhum\ClassAliasLoader\ClassAliasLoader;
use TYPO3\CMS\Core\Package\PackageInterface;
use TYPO3\CMS\Core\Utility\GeneralUtility;
diff --git a/typo3/sysext/frontend/Classes/Http/Application.php b/typo3/sysext/frontend/Classes/Http/Application.php
index 4ca07a8fc3a0..43d29d4d0563 100644
--- a/typo3/sysext/frontend/Classes/Http/Application.php
+++ b/typo3/sysext/frontend/Classes/Http/Application.php
@@ -13,10 +13,10 @@ namespace TYPO3\CMS\Frontend\Http;
*
* The TYPO3 project - inspiring people to share!
*/
+
use TYPO3\CMS\Core\Core\ApplicationInterface;
use TYPO3\CMS\Core\Core\Bootstrap;
-
/**
* Entry point for the TYPO3 Frontend
*/
@@ -45,7 +45,7 @@ class Application implements ApplicationInterface {
/**
* Constructor setting up legacy constant and register available Request Handlers
*
- * @param \Composer\Autoload\ClassLoader|\Helhum\ClassAliasLoader\Composer\ClassAliasLoader $classLoader an instance of the class loader
+ * @param \Composer\Autoload\ClassLoader|\Helhum\ClassAliasLoader\ClassAliasLoader $classLoader an instance of the class loader
*/
public function __construct($classLoader) {
$this->defineLegacyConstants();
diff --git a/typo3/sysext/install/Classes/Http/Application.php b/typo3/sysext/install/Classes/Http/Application.php
index ae5629af3d59..929fe4c503cf 100644
--- a/typo3/sysext/install/Classes/Http/Application.php
+++ b/typo3/sysext/install/Classes/Http/Application.php
@@ -43,7 +43,7 @@ class Application implements ApplicationInterface {
/**
* Constructor setting up legacy constant and register available Request Handlers
*
- * @param \Composer\Autoload\ClassLoader|\Helhum\ClassAliasLoader\Composer\ClassAliasLoader $classLoader an instance of the class loader
+ * @param \Composer\Autoload\ClassLoader|\Helhum\ClassAliasLoader\ClassAliasLoader $classLoader an instance of the class loader
*/
public function __construct($classLoader) {
$this->defineLegacyConstants();
diff --git a/typo3/sysext/mediace/composer.json b/typo3/sysext/mediace/composer.json
index b05d0c0a5ded..86054c889fe8 100644
--- a/typo3/sysext/mediace/composer.json
+++ b/typo3/sysext/mediace/composer.json
@@ -13,9 +13,11 @@
"mediace": "*"
},
"extra": {
- "class-alias-maps": [
- "Migrations/Code/ClassAliasMap.php"
- ]
+ "helhum/class-alias-loader": {
+ "class-alias-maps": [
+ "Migrations/Code/ClassAliasMap.php"
+ ]
+ }
},
"autoload": {
"psr-4": {
--
GitLab