From 2a45c7c2b575e50f59c867719da12ce9f8ea37b0 Mon Sep 17 00:00:00 2001
From: Benjamin Mack <benni@typo3.org>
Date: Wed, 28 Oct 2015 07:31:05 +0100
Subject: [PATCH] [TASK] Change PHP namespace of EXT:jumpurl to FoT3
Change the PHP namespace and the according
composer.json information to FoT3 in preparation
of removing the extension from the Core.
Resolves: #71083
Releases: master
Change-Id: Ifd1018f36f6c7114c3f32ef293097e0c0cac1156
Reviewed-on: https://review.typo3.org/44323
Reviewed-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Tested-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
---
composer.json | 4 ++--
typo3/sysext/jumpurl/Classes/JumpUrlHandler.php | 2 +-
typo3/sysext/jumpurl/Classes/JumpUrlProcessor.php | 2 +-
typo3/sysext/jumpurl/Classes/JumpUrlUtility.php | 2 +-
.../jumpurl/Tests/Unit/ContentObjectRendererTest.php | 6 +++---
typo3/sysext/jumpurl/Tests/Unit/JumpUrlHandlerTest.php | 6 +++---
typo3/sysext/jumpurl/Tests/Unit/JumpUrlProcessorMock.php | 4 ++--
typo3/sysext/jumpurl/Tests/Unit/JumpUrlProcessorTest.php | 2 +-
typo3/sysext/jumpurl/composer.json | 9 +++++----
typo3/sysext/jumpurl/ext_emconf.php | 6 +++---
typo3/sysext/jumpurl/ext_localconf.php | 4 ++--
11 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/composer.json b/composer.json
index e423d967ee52..39d4ba723bbd 100644
--- a/composer.json
+++ b/composer.json
@@ -151,7 +151,7 @@
"TYPO3\\CMS\\Info\\": "typo3/sysext/info/Classes/",
"TYPO3\\CMS\\InfoPagetsconfig\\": "typo3/sysext/info_pagetsconfig/Classes/",
"TYPO3\\CMS\\Install\\": "typo3/sysext/install/Classes/",
- "TYPO3\\CMS\\Jumpurl\\": "typo3/sysext/jumpurl/Classes/",
+ "FoT3\\Jumpurl\\": "typo3/sysext/jumpurl/Classes/",
"TYPO3\\CMS\\Lang\\": "typo3/sysext/lang/Classes/",
"TYPO3\\CMS\\Linkvalidator\\": "typo3/sysext/linkvalidator/Classes/",
"TYPO3\\CMS\\Lowlevel\\": "typo3/sysext/lowlevel/Classes/",
@@ -201,7 +201,7 @@
"TYPO3\\CMS\\Impexp\\Tests\\": "typo3/sysext/impexp/Tests/",
"TYPO3\\CMS\\IndexedSearch\\Tests\\": "typo3/sysext/indexed_search/Tests/",
"TYPO3\\CMS\\Install\\Tests\\": "typo3/sysext/install/Tests/",
- "TYPO3\\CMS\\Jumpurl\\Tests\\": "typo3/sysext/jumpurl/Tests/",
+ "FoT3\\Jumpurl\\Tests\\": "typo3/sysext/jumpurl/Tests/",
"TYPO3\\CMS\\Lang\\Tests\\": "typo3/sysext/lang/Tests/",
"TYPO3\\CMS\\Lowlevel\\Tests\\": "typo3/sysext/lowlevel/Tests/",
"TYPO3\\CMS\\Mediace\\": "typo3/sysext/mediace/Classes/",
diff --git a/typo3/sysext/jumpurl/Classes/JumpUrlHandler.php b/typo3/sysext/jumpurl/Classes/JumpUrlHandler.php
index 9466a4bae562..e3a78c97c69c 100644
--- a/typo3/sysext/jumpurl/Classes/JumpUrlHandler.php
+++ b/typo3/sysext/jumpurl/Classes/JumpUrlHandler.php
@@ -1,5 +1,5 @@
<?php
-namespace TYPO3\CMS\Jumpurl;
+namespace FoT3\Jumpurl;
/*
* This file is part of the TYPO3 CMS project.
diff --git a/typo3/sysext/jumpurl/Classes/JumpUrlProcessor.php b/typo3/sysext/jumpurl/Classes/JumpUrlProcessor.php
index ac8b403012f4..fa3df5a885f1 100644
--- a/typo3/sysext/jumpurl/Classes/JumpUrlProcessor.php
+++ b/typo3/sysext/jumpurl/Classes/JumpUrlProcessor.php
@@ -1,5 +1,5 @@
<?php
-namespace TYPO3\CMS\Jumpurl;
+namespace FoT3\Jumpurl;
/*
* This file is part of the TYPO3 CMS project.
diff --git a/typo3/sysext/jumpurl/Classes/JumpUrlUtility.php b/typo3/sysext/jumpurl/Classes/JumpUrlUtility.php
index cb36cbf79f81..7ffe60627ef2 100644
--- a/typo3/sysext/jumpurl/Classes/JumpUrlUtility.php
+++ b/typo3/sysext/jumpurl/Classes/JumpUrlUtility.php
@@ -1,5 +1,5 @@
<?php
-namespace TYPO3\CMS\Jumpurl;
+namespace FoT3\Jumpurl;
/*
* This file is part of the TYPO3 CMS project.
diff --git a/typo3/sysext/jumpurl/Tests/Unit/ContentObjectRendererTest.php b/typo3/sysext/jumpurl/Tests/Unit/ContentObjectRendererTest.php
index 557a02b667fc..bb0bcc44295b 100644
--- a/typo3/sysext/jumpurl/Tests/Unit/ContentObjectRendererTest.php
+++ b/typo3/sysext/jumpurl/Tests/Unit/ContentObjectRendererTest.php
@@ -1,5 +1,5 @@
<?php
-namespace TYPO3\CMS\Jumpurl\Tests\Unit;
+namespace FoT3\Jumpurl\Tests\Unit;
/*
* This file is part of the TYPO3 CMS project.
@@ -24,8 +24,8 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
use TYPO3\CMS\Frontend\Page\PageRepository;
-use TYPO3\CMS\Jumpurl\JumpUrlHandler;
-use TYPO3\CMS\Jumpurl\JumpUrlProcessor;
+use FoT3\Jumpurl\JumpUrlHandler;
+use FoT3\Jumpurl\JumpUrlProcessor;
/**
* Testcase for the jumpurl processing in TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer.
diff --git a/typo3/sysext/jumpurl/Tests/Unit/JumpUrlHandlerTest.php b/typo3/sysext/jumpurl/Tests/Unit/JumpUrlHandlerTest.php
index a59ee19c1a04..31ae4c062362 100644
--- a/typo3/sysext/jumpurl/Tests/Unit/JumpUrlHandlerTest.php
+++ b/typo3/sysext/jumpurl/Tests/Unit/JumpUrlHandlerTest.php
@@ -1,5 +1,5 @@
<?php
-namespace TYPO3\CMS\Jumpurl\Tests\Unit;
+namespace FoT3\Jumpurl\Tests\Unit;
/*
* This file is part of the TYPO3 CMS project.
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Resource\ResourceFactory;
use TYPO3\CMS\Core\Utility\HttpUtility;
use TYPO3\CMS\Frontend\Authentication\FrontendUserAuthentication;
use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
-use TYPO3\CMS\Jumpurl\JumpUrlHandler;
+use FoT3\Jumpurl\JumpUrlHandler;
/**
* Testcase for handling jump URLs when given with a test parameter
@@ -334,7 +334,7 @@ class JumpUrlHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
->will($this->returnValue(true));
- $hash = \TYPO3\CMS\Jumpurl\JumpUrlUtility::calculateHashSecure($path, '', '');
+ $hash = \FoT3\Jumpurl\JumpUrlUtility::calculateHashSecure($path, '', '');
$_GET['jumpurl'] = $path;
$_GET['juSecure'] = '1';
diff --git a/typo3/sysext/jumpurl/Tests/Unit/JumpUrlProcessorMock.php b/typo3/sysext/jumpurl/Tests/Unit/JumpUrlProcessorMock.php
index 31f4a53b32a3..f352367dcba5 100644
--- a/typo3/sysext/jumpurl/Tests/Unit/JumpUrlProcessorMock.php
+++ b/typo3/sysext/jumpurl/Tests/Unit/JumpUrlProcessorMock.php
@@ -1,5 +1,5 @@
<?php
-namespace TYPO3\CMS\Jumpurl\Tests\Unit;
+namespace FoT3\Jumpurl\Tests\Unit;
/*
* This file is part of the TYPO3 CMS project.
@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Jumpurl\Tests\Unit;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3\CMS\Jumpurl\JumpUrlProcessor;
+use FoT3\Jumpurl\JumpUrlProcessor;
/**
* Testcase for handling jump URLs when given with a test parameter
diff --git a/typo3/sysext/jumpurl/Tests/Unit/JumpUrlProcessorTest.php b/typo3/sysext/jumpurl/Tests/Unit/JumpUrlProcessorTest.php
index a087091cfbfd..51c49dce376c 100644
--- a/typo3/sysext/jumpurl/Tests/Unit/JumpUrlProcessorTest.php
+++ b/typo3/sysext/jumpurl/Tests/Unit/JumpUrlProcessorTest.php
@@ -1,5 +1,5 @@
<?php
-namespace TYPO3\CMS\Jumpurl\Tests\Unit;
+namespace FoT3\Jumpurl\Tests\Unit;
/*
* This file is part of the TYPO3 CMS project.
diff --git a/typo3/sysext/jumpurl/composer.json b/typo3/sysext/jumpurl/composer.json
index 9089de71e14e..3fe4118d0eac 100644
--- a/typo3/sysext/jumpurl/composer.json
+++ b/typo3/sysext/jumpurl/composer.json
@@ -1,24 +1,25 @@
{
- "name": "typo3/cms-jumpurl",
+ "name": "friendsoftypo3/jumpurl",
"type": "typo3-cms-extension",
"description": "TYPO3 Jump URL handling",
"homepage": "https://typo3.org",
"license": ["GPL-2.0+"],
"require": {
- "typo3/cms-core": "*"
+ "typo3/cms-core": "~7.5",
+ "typo3/cms-frontend": "~7.5"
},
"replace": {
"jumpurl": "*"
},
"autoload": {
"psr-4": {
- "TYPO3\\CMS\\Jumpurl\\": "Classes/"
+ "FoT3\\Jumpurl\\": "Classes/"
}
},
"autoload-dev": {
"psr-4": {
- "TYPO3\\CMS\\Jumpurl\\Tests\\": "Tests/"
+ "FoT3\\Jumpurl\\Tests\\": "Tests/"
}
}
}
diff --git a/typo3/sysext/jumpurl/ext_emconf.php b/typo3/sysext/jumpurl/ext_emconf.php
index f53012da5a1a..ed93ee713e9d 100644
--- a/typo3/sysext/jumpurl/ext_emconf.php
+++ b/typo3/sysext/jumpurl/ext_emconf.php
@@ -3,8 +3,8 @@ $EM_CONF[$_EXTKEY] = array(
'title' => 'JumpURL',
'description' => 'Allows to modify links to create Jump URLs created in the frontend of the TYPO3 Core.',
'category' => 'fe',
- 'author' => 'TYPO3 CMS Team',
- 'author_email' => 'info@typo3.org',
+ 'author' => 'Friends of TYPO3',
+ 'author_email' => 'friendsof@typo3.org',
'state' => 'stable',
'uploadfolder' => 0,
'createDirs' => '',
@@ -13,7 +13,7 @@ $EM_CONF[$_EXTKEY] = array(
'version' => '7.6.0',
'constraints' => array(
'depends' => array(
- 'typo3' => '7.6.0-7.6.99',
+ 'typo3' => '7.6.0-7.99.99',
),
'conflicts' => array(),
'suggests' => array(),
diff --git a/typo3/sysext/jumpurl/ext_localconf.php b/typo3/sysext/jumpurl/ext_localconf.php
index 38423df7d820..c610e05e4244 100644
--- a/typo3/sysext/jumpurl/ext_localconf.php
+++ b/typo3/sysext/jumpurl/ext_localconf.php
@@ -2,9 +2,9 @@
defined('TYPO3_MODE') or die();
// Register hooks
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['urlProcessing']['urlProcessors']['jumpurl']['processor'] = \TYPO3\CMS\Jumpurl\JumpUrlProcessor::class;
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['urlProcessing']['urlProcessors']['jumpurl']['processor'] = \FoT3\Jumpurl\JumpUrlProcessor::class;
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['urlProcessing']['urlHandlers']['jumpurl'] = [
- 'handler' => \TYPO3\CMS\Jumpurl\JumpUrlHandler::class,
+ 'handler' => \FoT3\Jumpurl\JumpUrlHandler::class,
'before' => [
'frontendExternalUrl'
],
--
GitLab