Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
typo3
typo3
Commits
ee9443bb
Commit
ee9443bb
authored
Oct 17, 2012
by
Thomas Maroschik
Browse files
[TASK] Namespace classes
Change-Id: I403aee9d244a65e51547b21dac3b1228ffd3478e
parent
08912869
Changes
459
Hide whitespace changes
Inline
Side-by-side
typo3/sysext/extbase/Classes/Command/HelpCommandController.php
View file @
ee9443bb
<?php
namespace
TYPO3\CMS\Extbase\Command
;
/***************************************************************
* Copyright notice
* All rights reserved
...
...
@@ -24,10 +26,10 @@
*
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License, version 3 or later
*/
class
Tx_Extbase_Command_
HelpCommandController
extends
Tx_
Extbase
_MVC_
Controller
_
CommandController
{
class
HelpCommandController
extends
\
TYPO3\CMS\
Extbase
\Mvc\
Controller
\
CommandController
{
/**
* @var
Tx_Extbase_MVC_CLI_
CommandManager
* @var
\TYPO3\CMS\Extbase\Mvc\Cli\
CommandManager
*/
protected
$commandManager
;
...
...
@@ -37,11 +39,11 @@ class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller
protected
$commandsByExtensionsAndControllers
=
array
();
/**
* @param
Tx_Extbase_MVC_CLI_
CommandManager $commandManager
* @param
\TYPO3\CMS\Extbase\Mvc\Cli\
CommandManager $commandManager
* @return void
* @author Bastian Waidelich <bastian@typo3.org>
*/
public
function
injectCommandManager
(
Tx_Extbase_MVC_CLI_
CommandManager
$commandManager
)
{
public
function
injectCommandManager
(
\
TYPO3\CMS\Extbase\Mvc\Cli\
CommandManager
$commandManager
)
{
$this
->
commandManager
=
$commandManager
;
}
...
...
@@ -55,7 +57,7 @@ class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller
* @internal
*/
public
function
helpStubCommand
()
{
$this
->
outputLine
(
'Extbase %s'
,
array
(
t3lib_extMgm
::
getExtensionVersion
(
'extbase'
)));
$this
->
outputLine
(
'Extbase %s'
,
array
(
\
TYPO3\CMS\Core\Extension\ExtensionManager
::
getExtensionVersion
(
'extbase'
)));
$this
->
outputLine
(
'usage: ./cli_dispatch.phpsh extbase <command identifier>'
);
$this
->
outputLine
();
$this
->
outputLine
(
'See \'./cli_dispatch.phpsh extbase help\' for a list of all available commands.'
);
...
...
@@ -77,7 +79,7 @@ class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller
}
else
{
try
{
$command
=
$this
->
commandManager
->
getCommandByIdentifier
(
$commandIdentifier
);
}
catch
(
Tx_
Extbase
_MVC_
Exception
_
Command
$exception
)
{
}
catch
(
\
TYPO3\CMS\
Extbase
\Mvc\
Exception
\
Command
Exception
$exception
)
{
$this
->
outputLine
(
$exception
->
getMessage
());
return
;
}
...
...
@@ -90,7 +92,7 @@ class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller
*/
protected
function
displayHelpIndex
()
{
$this
->
buildCommandsIndex
();
$this
->
outputLine
(
'Extbase %s'
,
array
(
t3lib_extMgm
::
getExtensionVersion
(
'extbase'
)));
$this
->
outputLine
(
'Extbase %s'
,
array
(
\
TYPO3\CMS\Core\Extension\ExtensionManager
::
getExtensionVersion
(
'extbase'
)));
$this
->
outputLine
(
'usage: ./cli_dispatch.phpsh extbase <command identifier>'
);
$this
->
outputLine
();
$this
->
outputLine
(
'The following commands are currently available:'
);
...
...
@@ -114,10 +116,10 @@ class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller
/**
* Render help text for a single command
*
* @param
Tx_Extbase_MVC_CLI_
Command $command
* @param
\TYPO3\CMS\Extbase\Mvc\Cli\
Command $command
* @return void
*/
protected
function
displayHelpForCommand
(
Tx_Extbase_MVC_CLI_
Command
$command
)
{
protected
function
displayHelpForCommand
(
\
TYPO3\CMS\Extbase\Mvc\Cli\
Command
$command
)
{
$this
->
outputLine
();
$this
->
outputLine
(
$command
->
getShortDescription
());
$this
->
outputLine
();
...
...
@@ -188,13 +190,13 @@ class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller
* Displays an error message
*
* @internal
* @param
Tx_
Extbase
_MVC_
Exception
_
Command $exception
* @param
\TYPO3\CMS\
Extbase
\Mvc\
Exception
\
Command
Exception
$exception
* @return void
* @author Bastian Waidelich <bastian@typo3.org>
*/
public
function
errorCommand
(
Tx_
Extbase
_MVC_
Exception
_
Command
$exception
)
{
public
function
errorCommand
(
\
TYPO3\CMS\
Extbase
\Mvc\
Exception
\
Command
Exception
$exception
)
{
$this
->
outputLine
(
$exception
->
getMessage
());
if
(
$exception
instanceof
Tx_
Extbase
_MVC_
Exception
_
AmbiguousCommandIdentifier
)
{
if
(
$exception
instanceof
\
TYPO3\CMS\
Extbase
\Mvc\
Exception
\
AmbiguousCommandIdentifier
Exception
)
{
$this
->
outputLine
(
'Please specify the complete command identifier. Matched commands:'
);
foreach
(
$exception
->
getMatchingCommands
()
as
$matchingCommand
)
{
$this
->
outputLine
(
' %s'
,
array
(
$matchingCommand
->
getCommandIdentifier
()));
...
...
@@ -229,4 +231,5 @@ class Tx_Extbase_Command_HelpCommandController extends Tx_Extbase_MVC_Controller
}
?>
\ No newline at end of file
typo3/sysext/extbase/Classes/Configuration/AbstractConfigurationManager.php
View file @
ee9443bb
<?php
namespace
TYPO3\CMS\Extbase\Configuration
;
/***************************************************************
* Copyright notice
*
...
...
@@ -28,7 +30,7 @@
* @subpackage Configuration
* @version $ID:$
*/
abstract
class
Tx_Extbase_Configuration_
AbstractConfigurationManager
implements
t3lib_Singleton
{
abstract
class
AbstractConfigurationManager
implements
\
TYPO3\CMS\Core\SingletonInterface
{
/**
* Default backend storage PID
...
...
@@ -42,17 +44,17 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
protected
$configuration
=
array
();
/**
* @var
tslib_cObj
* @var
\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
*/
protected
$contentObject
;
/**
* @var
Tx_
Extbase
_
Object
_
ObjectManagerInterface
* @var
\TYPO3\CMS\
Extbase
\
Object
\
ObjectManagerInterface
*/
protected
$objectManager
;
/**
* @var
Tx_
Extbase
_
Service
_
TypoScriptService
* @var
\TYPO3\CMS\
Extbase
\
Service
\
TypoScriptService
*/
protected
$typoScriptService
;
...
...
@@ -78,26 +80,26 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
protected
$configurationCache
=
array
();
/**
* @param
Tx_
Extbase
_
Object
_
ObjectManagerInterface $objectManager
* @param
\TYPO3\CMS\
Extbase
\
Object
\
ObjectManagerInterface $objectManager
* @return void
*/
public
function
injectObjectManager
(
Tx_
Extbase
_
Object
_
ObjectManagerInterface
$objectManager
)
{
public
function
injectObjectManager
(
\
TYPO3\CMS\
Extbase
\
Object
\
ObjectManagerInterface
$objectManager
)
{
$this
->
objectManager
=
$objectManager
;
}
/**
* @param
Tx_
Extbase
_
Service
_
TypoScriptService $typoScriptService
* @param
\TYPO3\CMS\
Extbase
\
Service
\
TypoScriptService $typoScriptService
* @return void
*/
public
function
injectTypoScriptService
(
Tx_
Extbase
_
Service
_
TypoScriptService
$typoScriptService
)
{
public
function
injectTypoScriptService
(
\
TYPO3\CMS\
Extbase
\
Service
\
TypoScriptService
$typoScriptService
)
{
$this
->
typoScriptService
=
$typoScriptService
;
}
/**
* @param
tslib_cObj
$contentObject
* @param
\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
$contentObject
* @return void
*/
public
function
setContentObject
(
tslib_cObj
$contentObject
=
NULL
)
{
public
function
setContentObject
(
\
TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
$contentObject
=
NULL
)
{
$this
->
contentObject
=
$contentObject
;
}
...
...
@@ -149,7 +151,7 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
// only merge $this->configuration and override switchableControllerActions when retrieving configuration of the current plugin
if
(
$extensionName
===
NULL
||
$extensionName
===
$this
->
extensionName
&&
$pluginName
===
$this
->
pluginName
)
{
$pluginConfiguration
=
$this
->
getPluginConfiguration
(
$this
->
extensionName
,
$this
->
pluginName
);
$pluginConfiguration
=
t3lib_div
::
array_merge_recursive_overrule
(
$pluginConfiguration
,
$this
->
configuration
);
$pluginConfiguration
=
\
TYPO3\CMS\Core\Utility\GeneralUtility
::
array_merge_recursive_overrule
(
$pluginConfiguration
,
$this
->
configuration
);
$pluginConfiguration
[
'controllerConfiguration'
]
=
$this
->
getSwitchableControllerActions
(
$this
->
extensionName
,
$this
->
pluginName
);
if
(
isset
(
$this
->
configuration
[
'switchableControllerActions'
]))
{
$this
->
overrideSwitchableControllerActions
(
$pluginConfiguration
,
$this
->
configuration
[
'switchableControllerActions'
]);
...
...
@@ -158,7 +160,7 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
$pluginConfiguration
=
$this
->
getPluginConfiguration
(
$extensionName
,
$pluginName
);
$pluginConfiguration
[
'controllerConfiguration'
]
=
$this
->
getSwitchableControllerActions
(
$extensionName
,
$pluginName
);
}
$frameworkConfiguration
=
t3lib_div
::
array_merge_recursive_overrule
(
$frameworkConfiguration
,
$pluginConfiguration
);
$frameworkConfiguration
=
\
TYPO3\CMS\Core\Utility\GeneralUtility
::
array_merge_recursive_overrule
(
$frameworkConfiguration
,
$pluginConfiguration
);
// only load context specific configuration when retrieving configuration of the current plugin
if
(
$extensionName
===
NULL
||
$extensionName
===
$this
->
extensionName
&&
$pluginName
===
$this
->
pluginName
)
{
$frameworkConfiguration
=
$this
->
getContextSpecificFrameworkConfiguration
(
$frameworkConfiguration
);
...
...
@@ -168,12 +170,12 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
stdWrap. Than we convert the configuration to normal TypoScript
and apply the stdWrap to the storagePid */
if
(
TYPO3_MODE
!==
'FE'
)
{
Tx_
Extbase
_
Utility
_
FrontendSimulator
::
simulateFrontendEnvironment
(
$this
->
getContentObject
());
\
TYPO3\CMS\
Extbase
\
Utility
\
FrontendSimulator
Utility
::
simulateFrontendEnvironment
(
$this
->
getContentObject
());
}
$configuration
=
$this
->
typoScriptService
->
convertPlainArrayToTypoScriptArray
(
$frameworkConfiguration
[
'persistence'
]);
$frameworkConfiguration
[
'persistence'
][
'storagePid'
]
=
$GLOBALS
[
'TSFE'
]
->
cObj
->
stdWrap
(
$configuration
[
'storagePid'
],
$configuration
[
'storagePid.'
]);
if
(
TYPO3_MODE
!==
'FE'
)
{
Tx_
Extbase
_
Utility
_
FrontendSimulator
::
resetFrontendEnvironment
();
\
TYPO3\CMS\
Extbase
\
Utility
\
FrontendSimulator
Utility
::
resetFrontendEnvironment
();
}
}
// 1st level cache
...
...
@@ -275,4 +277,5 @@ abstract class Tx_Extbase_Configuration_AbstractConfigurationManager implements
}
?>
\ No newline at end of file
typo3/sysext/extbase/Classes/Configuration/BackendConfigurationManager.php
View file @
ee9443bb
<?php
namespace
TYPO3\CMS\Extbase\Configuration
;
/***************************************************************
* Copyright notice
*
...
...
@@ -28,7 +30,7 @@
* @subpackage Configuration
* @version $ID:$
*/
class
Tx_Extbase_Configuration_
BackendConfigurationManager
extends
Tx_
Extbase
_
Configuration
_
AbstractConfigurationManager
{
class
BackendConfigurationManager
extends
\
TYPO3\CMS\
Extbase
\
Configuration
\
AbstractConfigurationManager
{
/**
* @var array
...
...
@@ -42,7 +44,7 @@ class Tx_Extbase_Configuration_BackendConfigurationManager extends Tx_Extbase_Co
*/
public
function
getTypoScriptSetup
()
{
if
(
$this
->
typoScriptSetupCache
===
NULL
)
{
$template
=
t3lib_div
::
makeInstance
(
't3lib_TStemplat
e'
);
$template
=
\
TYPO3\CMS\Core\Utility\GeneralUtility
::
makeInstance
(
'TYPO3\\CMS\\Core\\TypoScript\\TemplateServic
e'
);
// do not log time-performance information
$template
->
tt_track
=
0
;
$template
->
init
();
...
...
@@ -50,8 +52,8 @@ class Tx_Extbase_Configuration_BackendConfigurationManager extends Tx_Extbase_Co
$rootline
=
array
();
$pageId
=
$this
->
getCurrentPageId
();
if
(
$pageId
>
0
)
{
/** @var $sysPage
t3lib_pageSelect
*/
$sysPage
=
t3lib_div
::
makeInstance
(
't3lib_pageSelect
'
);
/** @var $sysPage
\TYPO3\CMS\Frontend\Page\PageRepository
*/
$sysPage
=
\
TYPO3\CMS\Core\Utility\GeneralUtility
::
makeInstance
(
'TYPO3\\CMS\\Frontend\\Page\\PageRepository
'
);
// Get the rootline for the current page
$rootline
=
$sysPage
->
getRootLine
(
$this
->
getCurrentPageId
(),
''
,
TRUE
);
}
...
...
@@ -80,7 +82,7 @@ class Tx_Extbase_Configuration_BackendConfigurationManager extends Tx_Extbase_Co
if
(
$pluginName
!==
NULL
)
{
$pluginSignature
=
strtolower
((
$extensionName
.
'_'
)
.
$pluginName
);
if
(
is_array
(
$setup
[
'module.'
][(
'tx_'
.
$pluginSignature
)
.
'.'
]))
{
$pluginConfiguration
=
t3lib_div
::
array_merge_recursive_overrule
(
$pluginConfiguration
,
$this
->
typoScriptService
->
convertTypoScriptArrayToPlainArray
(
$setup
[
'module.'
][(
'tx_'
.
$pluginSignature
)
.
'.'
]));
$pluginConfiguration
=
\
TYPO3\CMS\Core\Utility\GeneralUtility
::
array_merge_recursive_overrule
(
$pluginConfiguration
,
$this
->
typoScriptService
->
convertTypoScriptArrayToPlainArray
(
$setup
[
'module.'
][(
'tx_'
.
$pluginSignature
)
.
'.'
]));
}
}
return
$pluginConfiguration
;
...
...
@@ -112,7 +114,7 @@ class Tx_Extbase_Configuration_BackendConfigurationManager extends Tx_Extbase_Co
* @return integer current page id. If no page is selected current root page id is returned
*/
protected
function
getCurrentPageId
()
{
$pageId
=
(
int
)
t3lib_div
::
_GP
(
'id'
);
$pageId
=
(
int
)
\
TYPO3\CMS\Core\Utility\GeneralUtility
::
_GP
(
'id'
);
if
(
$pageId
>
0
)
{
return
$pageId
;
}
...
...
@@ -150,8 +152,8 @@ class Tx_Extbase_Configuration_BackendConfigurationManager extends Tx_Extbase_Co
protected
function
getContextSpecificFrameworkConfiguration
(
array
$frameworkConfiguration
)
{
if
(
!
isset
(
$frameworkConfiguration
[
'mvc'
][
'requestHandlers'
]))
{
$frameworkConfiguration
[
'mvc'
][
'requestHandlers'
]
=
array
(
'T
x_Extbase_MVC_
Web
_
FrontendRequestHandler'
=>
'T
x_Extbase_MVC_
Web
_
FrontendRequestHandler'
,
'T
x_Extbase_MVC_
Web
_
BackendRequestHandler'
=>
'T
x_Extbase_MVC_
Web
_
BackendRequestHandler'
'T
YPO3\\CMS\\Extbase\\Mvc\\
Web
\\
FrontendRequestHandler'
=>
'T
YPO3\\CMS\\Extbase\\Mvc\\
Web
\\
FrontendRequestHandler'
,
'T
YPO3\\CMS\\Extbase\\Mvc\\
Web
\\
BackendRequestHandler'
=>
'T
YPO3\\CMS\\Extbase\\Mvc\\
Web
\\
BackendRequestHandler'
);
}
return
$frameworkConfiguration
;
...
...
@@ -159,4 +161,5 @@ class Tx_Extbase_Configuration_BackendConfigurationManager extends Tx_Extbase_Co
}
?>
\ No newline at end of file
typo3/sysext/extbase/Classes/Configuration/ConfigurationManager.php
View file @
ee9443bb
<?php
namespace
TYPO3\CMS\Extbase\Configuration
;
/***************************************************************
* Copyright notice
*
...
...
@@ -31,23 +33,23 @@
* @subpackage Configuration
* @version $ID:$
*/
class
Tx_Extbase_Configuration_
ConfigurationManager
implements
Tx_
Extbase
_
Configuration
_
ConfigurationManagerInterface
{
class
ConfigurationManager
implements
\
TYPO3\CMS\
Extbase
\
Configuration
\
ConfigurationManagerInterface
{
/**
* @var
Tx_
Extbase
_
Object
_
ObjectManagerInterface
* @var
\TYPO3\CMS\
Extbase
\
Object
\
ObjectManagerInterface
*/
protected
$objectManager
;
/**
* @var
Tx_
Extbase
_
Configuration
_
AbstractConfigurationManager
* @var
\TYPO3\CMS\
Extbase
\
Configuration
\
AbstractConfigurationManager
*/
protected
$concreteConfigurationManager
;
/**
* @param
Tx_
Extbase
_
Object
_
ObjectManagerInterface $objectManager
* @param
\TYPO3\CMS\
Extbase
\
Object
\
ObjectManagerInterface $objectManager
* @return void
*/
public
function
injectObjectManager
(
Tx_
Extbase
_
Object
_
ObjectManagerInterface
$objectManager
)
{
public
function
injectObjectManager
(
\
TYPO3\CMS\
Extbase
\
Object
\
ObjectManagerInterface
$objectManager
)
{
$this
->
objectManager
=
$objectManager
;
$this
->
initializeConcreteConfigurationManager
();
}
...
...
@@ -57,22 +59,22 @@ class Tx_Extbase_Configuration_ConfigurationManager implements Tx_Extbase_Config
*/
protected
function
initializeConcreteConfigurationManager
()
{
if
(
TYPO3_MODE
===
'FE'
)
{
$this
->
concreteConfigurationManager
=
$this
->
objectManager
->
get
(
'T
x_
Extbase
_
Configuration
_
FrontendConfigurationManager'
);
$this
->
concreteConfigurationManager
=
$this
->
objectManager
->
get
(
'T
YPO3\\CMS\\
Extbase
\\
Configuration
\\
FrontendConfigurationManager'
);
}
else
{
$this
->
concreteConfigurationManager
=
$this
->
objectManager
->
get
(
'T
x_
Extbase
_
Configuration
_
BackendConfigurationManager'
);
$this
->
concreteConfigurationManager
=
$this
->
objectManager
->
get
(
'T
YPO3\\CMS\\
Extbase
\\
Configuration
\\
BackendConfigurationManager'
);
}
}
/**
* @param
tslib_cObj
$contentObject
* @param
\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
$contentObject
* @return void
*/
public
function
setContentObject
(
tslib_cObj
$contentObject
=
NULL
)
{
public
function
setContentObject
(
\
TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
$contentObject
=
NULL
)
{
$this
->
concreteConfigurationManager
->
setContentObject
(
$contentObject
);
}
/**
* @return
tslib_cObj
* @return
\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
*/
public
function
getContentObject
()
{
return
$this
->
concreteConfigurationManager
->
getContentObject
();
...
...
@@ -110,7 +112,7 @@ class Tx_Extbase_Configuration_ConfigurationManager implements Tx_Extbase_Config
case
self
::
CONFIGURATION_TYPE_FULL_TYPOSCRIPT
:
return
$this
->
concreteConfigurationManager
->
getTypoScriptSetup
();
default
:
throw
new
Tx_
Extbase
_
Configuration
_
Exception
_
InvalidConfigurationType
((
'Invalid configuration type "'
.
$configurationType
)
.
'"'
,
1206031879
);
throw
new
\
TYPO3\CMS\
Extbase
\
Configuration
\
Exception
\
InvalidConfigurationType
((
'Invalid configuration type "'
.
$configurationType
)
.
'"'
,
1206031879
);
}
}
...
...
@@ -131,4 +133,5 @@ class Tx_Extbase_Configuration_ConfigurationManager implements Tx_Extbase_Config
}
?>
\ No newline at end of file
typo3/sysext/extbase/Classes/Configuration/ConfigurationManagerInterface.php
View file @
ee9443bb
<?php
namespace
TYPO3\CMS\Extbase\Configuration
;
/***************************************************************
* Copyright notice
*
...
...
@@ -26,21 +28,21 @@
* @subpackage Configuration
* @version $ID:$
*/
interface
Tx_Extbase_Configuration_
ConfigurationManagerInterface
extends
t3lib_Singleton
interface
ConfigurationManagerInterface
extends
\
TYPO3\CMS\Core\SingletonInterface
{
const
CONFIGURATION_TYPE_FRAMEWORK
=
'Framework'
;
const
CONFIGURATION_TYPE_SETTINGS
=
'Settings'
;
const
CONFIGURATION_TYPE_FULL_TYPOSCRIPT
=
'FullTypoScript'
;
/**
* @param
tslib_cObj
$contentObject
* @param
\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
$contentObject
* @return void
*/
public
function
setContentObject
(
tslib_cObj
$contentObject
=
NULL
);
public
function
setContentObject
(
\
TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
$contentObject
=
NULL
);
/**
* Get the content object
*
* @return
tslib_cObj
* @return
\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
* @api (v4 only)
*/
public
function
getContentObject
();
...
...
@@ -80,4 +82,5 @@ interface Tx_Extbase_Configuration_ConfigurationManagerInterface extends t3lib_S
public
function
isFeatureEnabled
(
$featureName
);
}
?>
\ No newline at end of file
typo3/sysext/extbase/Classes/Configuration/Exception.php
View file @
ee9443bb
<?php
namespace
TYPO3\CMS\Extbase\Configuration
;
/***************************************************************
* Copyright notice
*
...
...
@@ -31,9 +33,10 @@
* @subpackage Configuration
* @version $ID:$
*/
class
Tx_Extbase_Configuration_
Exception
extends
Tx_
Extbase
_
Exception
{
class
Exception
extends
\
TYPO3\CMS\
Extbase
\
Exception
{
}
?>
\ No newline at end of file
typo3/sysext/extbase/Classes/Configuration/Exception/ContainerIsLocked.php
View file @
ee9443bb
...
...
@@ -4,5 +4,5 @@
* and will be removed by 7.0. The class was renamed and is now located at:
* typo3/sysext/extbase/Classes/Configuration/Exception/ContainerIsLockedException.php
*/
require_once
t3lib_extMgm
::
extPath
(
'extbase'
)
.
'Classes/Configuration/Exception/ContainerIsLockedException.php'
;
require_once
\
TYPO3\CMS\Core\Extension\ExtensionManager
::
extPath
(
'extbase'
)
.
'Classes/Configuration/Exception/ContainerIsLockedException.php'
;
?>
\ No newline at end of file
typo3/sysext/extbase/Classes/Configuration/Exception/ContainerIsLockedException.php
View file @
ee9443bb
<?php
namespace
TYPO3\CMS\Extbase\Configuration\Exception
;
/***************************************************************
* Copyright notice
*
...
...
@@ -34,9 +36,10 @@
* @subpackage Configuration\Exception
* @version $ID:$
*/
class
Tx_Extbase_Configuration_Exception_
ContainerIsLocked
extends
Tx_
Extbase
_
Configuration
_
Exception
{
class
ContainerIsLocked
extends
\
TYPO3\CMS\
Extbase
\
Configuration
\
Exception
{
}
?>
\ No newline at end of file
typo3/sysext/extbase/Classes/Configuration/Exception/InvalidConfigurationType.php
View file @
ee9443bb
...
...
@@ -4,5 +4,5 @@
* and will be removed by 7.0. The class was renamed and is now located at:
* typo3/sysext/extbase/Classes/Configuration/Exception/InvalidConfigurationTypeException.php
*/
require_once
t3lib_extMgm
::
extPath
(
'extbase'
)
.
'Classes/Configuration/Exception/InvalidConfigurationTypeException.php'
;
require_once
\
TYPO3\CMS\Core\Extension\ExtensionManager
::
extPath
(
'extbase'
)
.
'Classes/Configuration/Exception/InvalidConfigurationTypeException.php'
;
?>
\ No newline at end of file
typo3/sysext/extbase/Classes/Configuration/Exception/InvalidConfigurationTypeException.php
View file @
ee9443bb
<?php
namespace
TYPO3\CMS\Extbase\Configuration\Exception
;
/***************************************************************
* Copyright notice
*
...
...
@@ -34,9 +36,10 @@
* @subpackage Configuration\Exception
* @version $ID:$
*/
class
Tx_Extbase_Configuration_Exception_
InvalidConfigurationType
extends
Tx_
Extbase
_
Configuration
_
Exception
{
class
InvalidConfigurationType
extends
\
TYPO3\CMS\
Extbase
\
Configuration
\
Exception
{
}
?>
\ No newline at end of file
typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchFile.php
View file @
ee9443bb
...
...
@@ -4,5 +4,5 @@
* and will be removed by 7.0. The class was renamed and is now located at:
* typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchFileException.php
*/
require_once
t3lib_extMgm
::
extPath
(
'extbase'
)
.
'Classes/Configuration/Exception/NoSuchFileException.php'
;
require_once
\
TYPO3\CMS\Core\Extension\ExtensionManager
::
extPath
(
'extbase'
)
.
'Classes/Configuration/Exception/NoSuchFileException.php'
;
?>
\ No newline at end of file
typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchFileException.php
View file @
ee9443bb
<?php
namespace
TYPO3\CMS\Extbase\Configuration\Exception
;
/***************************************************************
* Copyright notice
*
...
...
@@ -34,9 +36,10 @@
* @subpackage Configuration\Exception
* @version $ID:$
*/
class
Tx_Extbase_Configuration_Exception_
NoSuchFile
extends
Tx_
Extbase
_
Configuration
_
Exception
{
class
NoSuchFile
extends
\
TYPO3\CMS\
Extbase
\
Configuration
\
Exception
{
}
?>
\ No newline at end of file
typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchOption.php
View file @
ee9443bb
...
...
@@ -4,5 +4,5 @@
* and will be removed by 7.0. The class was renamed and is now located at:
* typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchOptionException.php
*/
require_once
t3lib_extMgm
::
extPath
(
'extbase'
)
.
'Classes/Configuration/Exception/NoSuchOptionException.php'
;
require_once
\
TYPO3\CMS\Core\Extension\ExtensionManager
::
extPath
(
'extbase'
)
.
'Classes/Configuration/Exception/NoSuchOptionException.php'
;
?>
\ No newline at end of file
typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchOptionException.php
View file @
ee9443bb
<?php
namespace
TYPO3\CMS\Extbase\Configuration\Exception
;
/***************************************************************
* Copyright notice
*
...
...
@@ -34,9 +36,10 @@
* @subpackage Configuration\Exception
* @version $ID:$
*/
class
Tx_Extbase_Configuration_Exception_
NoSuchOption
extends
Tx_
Extbase
_
Configuration
_
Exception
{
class
NoSuchOption
extends
\
TYPO3\CMS\
Extbase
\
Configuration
\
Exception
{
}
?>
\ No newline at end of file
typo3/sysext/extbase/Classes/Configuration/Exception/ParseError.php
View file @
ee9443bb
...
...
@@ -4,5 +4,5 @@
* and will be removed by 7.0. The class was renamed and is now located at:
* typo3/sysext/extbase/Classes/Configuration/Exception/ParseErrorException.php
*/
require_once
t3lib_extMgm
::
extPath
(
'extbase'
)
.
'Classes/Configuration/Exception/ParseErrorException.php'
;
require_once
\
TYPO3\CMS\Core\Extension\ExtensionManager
::
extPath
(
'extbase'
)
.
'Classes/Configuration/Exception/ParseErrorException.php'
;
?>
\ No newline at end of file
typo3/sysext/extbase/Classes/Configuration/Exception/ParseErrorException.php
View file @
ee9443bb
<?php
namespace
TYPO3\CMS\Extbase\Configuration\Exception
;
/***************************************************************
* Copyright notice
*
...
...
@@ -34,9 +36,10 @@
* @subpackage Configuration\Exception
* @version $ID:$
*/
class
Tx_Extbase_Configuration_Exception_
ParseError
extends
Tx_
Extbase
_
Configuration
_
Exception
{
class
ParseError
extends
\
TYPO3\CMS\
Extbase
\
Configuration
\
Exception
{
}
?>
\ No newline at end of file
typo3/sysext/extbase/Classes/Configuration/FrontendConfigurationManager.php
View file @
ee9443bb
<?php
namespace
TYPO3\CMS\Extbase\Configuration
;
/***************************************************************
* Copyright notice
*
...
...
@@ -30,18 +32,18 @@
* @subpackage Configuration
* @version $ID:$
*/
class
Tx_Extbase_Configuration_
FrontendConfigurationManager
extends
Tx_
Extbase
_
Configuration
_
AbstractConfigurationManager
{
class
FrontendConfigurationManager
extends
\
TYPO3\CMS\
Extbase
\
Configuration
\
AbstractConfigurationManager
{
/**
* @var
Tx_
Extbase
_
Service
_
FlexFormService
* @var
\TYPO3\CMS\
Extbase
\
Service
\
FlexFormService
*/
protected
$flexFormService
;
/**
* @param
Tx_
Extbase
_
Service
_
FlexFormService $flexFormService
* @param
\TYPO3\CMS\
Extbase
\
Service
\
FlexFormService $flexFormService
* @return void
*/
public
function
injectFlexFormService
(
Tx_
Extbase
_
Service
_
FlexFormService
$flexFormService
)
{
public
function
injectFlexFormService
(
\
TYPO3\CMS\
Extbase
\
Service
\
FlexFormService
$flexFormService
)
{
$this
->
flexFormService
=
$flexFormService
;
}
...
...
@@ -71,7 +73,7 @@ class Tx_Extbase_Configuration_FrontendConfigurationManager extends Tx_Extbase_C
if
(
$pluginName
!==
NULL
)
{
$pluginSignature
=
strtolower
((
$extensionName
.
'_'
)
.
$pluginName
);
if
(
is_array
(
$setup
[
'plugin.'
][(
'tx_'
.
$pluginSignature
)
.
'.'
]))
{
$pluginConfiguration
=
t3lib_div
::
array_merge_recursive_overrule
(
$pluginConfiguration
,
$this
->
typoScriptService
->
convertTypoScriptArrayToPlainArray
(
$setup
[
'plugin.'
][(
'tx_'
.
$pluginSignature
)
.
'.'
]));
$pluginConfiguration
=
\
TYPO3\CMS\Core\Utility\GeneralUtility
::
array_merge_recursive_overrule
(
$pluginConfiguration
,
$this
->
typoScriptService
->
convertTypoScriptArrayToPlainArray
(
$setup
[
'plugin.'
][(
'tx_'
.
$pluginSignature
)
.
'.'
]));
}
}
return
$pluginConfiguration
;
...
...
@@ -123,7 +125,7 @@ class Tx_Extbase_Configuration_FrontendConfigurationManager extends Tx_Extbase_C
if
(
is_string
(
$pages
)
&&
strlen
(
$pages
)
>
0
)
{
$list
=
array
();
if
(
$this
->
contentObject
->
data
[
'recursive'
]
>
0
)
{
$explodedPages
=
t3lib_div
::
trimExplode
(
','
,
$pages
);
$explodedPages
=
\
TYPO3\CMS\Core\Utility\GeneralUtility
::
trimExplode
(
','
,
$pages
);
foreach
(
$explodedPages
as
$pid
)
{
$list
[]
=
trim
(
$this
->
contentObject
->
getTreeList
(
$pid
,
$this
->
contentObject
->
data
[
'recursive'
]),
','
);
}
...
...
@@ -131,7 +133,7 @@ class Tx_Extbase_Configuration_FrontendConfigurationManager extends Tx_Extbase_C
if
(
count
(
$list
)
>
0
)
{
$pages
=
(
$pages
.
','
)
.
implode
(
','
,
$list
);
}
$frameworkConfiguration
=
t3lib_div
::
array_merge_recursive_overrule
(
$frameworkConfiguration
,
array
(
$frameworkConfiguration
=
\
TYPO3\CMS\Core\Utility\GeneralUtility
::
array_merge_recursive_overrule
(
$frameworkConfiguration
,
array
(