Skip to content

Commit

Permalink
[TASK] Remove comments that contain v4 or FLOW information
Browse files Browse the repository at this point in the history
Whether a class or functionality is not available or available
differently in v4 or FLOW is not relevant for TYPO3 CMS.
Remove them.

Occurrences have been searched using:
git grep "TYPO3 4"
git grep " v4"
git grep -l "FLOW" | grep php$

Change-Id: I1e690c2b8eee2af0ade831600ee9a3e1cfe6437a
Releases: master
Resolves: #84126
Reviewed-on: https://review.typo3.org/55994
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Mathias Schreiber <mathias.schreiber@typo3.com>
Tested-by: Mathias Schreiber <mathias.schreiber@typo3.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
  • Loading branch information
bnf authored and bmack committed Mar 3, 2018
1 parent 61a6338 commit 34f2684
Show file tree
Hide file tree
Showing 54 changed files with 56 additions and 116 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
* Gateway for TCE (TYPO3 Core Engine) file-handling through POST forms.
* This script serves as the file administration part of the TYPO3 Core Engine.
* Basically it includes two libraries which are used to manipulate files on the server.
* Before TYPO3 4.3, it was located in typo3/tce_file.php and redirected back to a
* $redirectURL. Since 4.3 this class is also used for accessing via AJAX
*/
class FileController
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public function render()
];
} else {
// Check if some help text is available
// Since TYPO3 4.5 help text is expected to be an associative array
// Help text is expected to be an associative array
// with two key, "title" and "description"
// For the sake of backwards compatibility, we test if the help text
// is a string and use it as a description (this could happen if items
Expand Down
2 changes: 0 additions & 2 deletions typo3/sysext/backend/Classes/Utility/BackendUtility.php
Original file line number Diff line number Diff line change
Expand Up @@ -2417,8 +2417,6 @@ public static function helpText($table, $field)
/**
* API function that wraps the text / html in help text, so if a user hovers over it
* the help text will show up
* This is the new help API function since TYPO3 4.5, and uses the new behaviour
* (hover over text, no icon, no fulltext option, no option to disable the help)
*
* @param string $table The table name for which the help should be shown
* @param string $field The field name for which the help should be shown
Expand Down
8 changes: 3 additions & 5 deletions typo3/sysext/core/Classes/Cache/Backend/AbstractBackend.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
/**
* An abstract caching backend
*
* This file is a backport from FLOW3
* @api
*/
abstract class AbstractBackend implements BackendInterface, LoggerAwareInterface
Expand All @@ -44,9 +43,8 @@ abstract class AbstractBackend implements BackendInterface, LoggerAwareInterface
/**
* The current application context
*
* TYPO3 v4 note: This variable is currently unused in v4 context and set to
* "production" always. It is only kept to stay in sync with
* FLOW3 code.
* This variable is currently unused and set to "production" always.
* It is only kept to keep backwards compatibility.
*
* @var string
*/
Expand All @@ -62,7 +60,7 @@ abstract class AbstractBackend implements BackendInterface, LoggerAwareInterface
/**
* Constructs this backend
*
* @param string $context FLOW3's application context
* @param string $context Unused, for backward compatibility only
* @param array $options Configuration options - depends on the actual backend
* @throws \InvalidArgumentException
* @api
Expand Down
3 changes: 1 addition & 2 deletions typo3/sysext/core/Classes/Cache/Backend/ApcBackend.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
* This prefix makes sure that keys from the different installations do not
* conflict.
*
* This file is a backport from FLOW3
* @api
*/
class ApcBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implements \TYPO3\CMS\Core\Cache\Backend\TaggableBackendInterface
Expand Down Expand Up @@ -69,7 +68,7 @@ protected function getIdentifierPrefix()
/**
* Constructs this backend
*
* @param string $context FLOW3's application context
* @param string $context Unused, for backward compatibility only
* @param array $options Configuration options - unused here
* @throws \TYPO3\CMS\Core\Cache\Exception
*/
Expand Down
2 changes: 1 addition & 1 deletion typo3/sysext/core/Classes/Cache/Backend/ApcuBackend.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ protected function getIdentifierPrefix()
/**
* Constructs this backend
*
* @param string $context FLOW3's application context
* @param string $context Unused, for backward compatibility only
* @param array $options Configuration options - unused here
* @throws Cache\Exception
*/
Expand Down
5 changes: 0 additions & 5 deletions typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
/**
* A caching backend which stores cache entries in files
*
* This file is a backport from FLOW3
* @api
*/
class FileBackend extends \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend implements \TYPO3\CMS\Core\Cache\Backend\FreezableBackendInterface, \TYPO3\CMS\Core\Cache\Backend\TaggableBackendInterface
Expand Down Expand Up @@ -98,10 +97,6 @@ public function isFrozen()
* This method also detects if this backend is frozen and sets the internal
* flag accordingly.
*
* TYPO3 v4 note: This method is different between TYPO3 v4 and FLOW3
* because the Environment class to get the path to a temporary directory
* does not exist in v4.
*
* @param \TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache The cache frontend
*/
public function setCache(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
<?php
namespace TYPO3\CMS\Core\Cache\Backend;

/* *
* This script belongs to the FLOW3 framework. *
* *
* It is free software; you can redistribute it and/or modify it under *
* the terms of the GNU Lesser General Public License, either version 3 *
* of the License, or (at your option) any later version. *
* *
* The TYPO3 project - inspiring people to share! *
* */
/*
* This file is part of the TYPO3 CMS project.
*
* It is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License, either version 2
* of the License, or any later version.
*
* For the full copyright and license information, please read the
* LICENSE.txt file that was distributed with this source code.
*
* The TYPO3 project - inspiring people to share!
*/

/**
* A contract for a cache backend which can be frozen.
*
Expand Down
3 changes: 1 addition & 2 deletions typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
* Note: When using the Memcached backend to store values of more than ~1 MB,
* the data will be split into chunks to make them fit into the memcached limits.
*
* This file is a backport from FLOW3 by Ingo Renner.
* @api
*/
class MemcachedBackend extends AbstractBackend implements TaggableBackendInterface, TransientBackendInterface
Expand Down Expand Up @@ -91,7 +90,7 @@ class MemcachedBackend extends AbstractBackend implements TaggableBackendInterfa
/**
* Constructs this backend
*
* @param string $context FLOW3's application context
* @param string $context Unused, for backward compatibility only
* @param array $options Configuration options - depends on the actual backend
* @throws Exception if memcache is not installed
*/
Expand Down
1 change: 0 additions & 1 deletion typo3/sysext/core/Classes/Cache/Backend/NullBackend.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
/**
* A caching backend which forgets everything immediately
*
* This file is a backport from FLOW3
* @api
*/
class NullBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implements \TYPO3\CMS\Core\Cache\Backend\PhpCapableBackendInterface, \TYPO3\CMS\Core\Cache\Backend\TaggableBackendInterface
Expand Down
2 changes: 1 addition & 1 deletion typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class RedisBackend extends AbstractBackend implements TaggableBackendInterface
/**
* Construct this backend
*
* @param string $context FLOW3's application context
* @param string $context Unused, for backward compatibility only
* @param array $options Configuration options
* @throws \TYPO3\CMS\Core\Cache\Exception if php redis module is not loaded
*/
Expand Down
32 changes: 14 additions & 18 deletions typo3/sysext/core/Classes/Cache/Backend/SimpleFileBackend.php
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
<?php
namespace TYPO3\CMS\Core\Cache\Backend;

/* *
* This script belongs to the FLOW3 framework. *
* *
* It is free software; you can redistribute it and/or modify it under *
* the terms of the GNU Lesser General Public License, either version 3 *
* of the License, or (at your option) any later version. *
* *
* The TYPO3 project - inspiring people to share! *
* */
/*
* This file is part of the TYPO3 CMS project.
*
* It is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License, either version 2
* of the License, or any later version.
*
* For the full copyright and license information, please read the
* LICENSE.txt file that was distributed with this source code.
*
* The TYPO3 project - inspiring people to share!
*/

use TYPO3\CMS\Core\Service\OpcodeCacheService;
use TYPO3\CMS\Core\Utility\GeneralUtility;
Expand All @@ -35,7 +38,6 @@ class SimpleFileBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend im
protected $cacheDirectory = '';

/**
* TYPO3 v4 note: This variable is only available in v5
* Temporary path to cache directory before setCache() was called. It is
* set by setCacheDirectory() and used in setCache() method which calls
* the directory creation if needed. The variable is not used afterwards,
Expand Down Expand Up @@ -66,10 +68,6 @@ class SimpleFileBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend im
* Sets a reference to the cache frontend which uses this backend and
* initializes the default cache directory.
*
* TYPO3 v4 note: This method is different between TYPO3 v4 and FLOW3
* because the Environment class to get the path to a temporary directory
* does not exist in v4.
*
* @param \TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache The cache frontend
* @throws \TYPO3\CMS\Core\Cache\Exception
*/
Expand Down Expand Up @@ -101,8 +99,7 @@ public function setCache(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache
* assumed that the directory is below the TYPO3_DOCUMENT_ROOT. However, an
* absolute path can be selected, too.
*
* This method does not exist in FLOW3 anymore, but it is needed in
* TYPO3 v4 to enable a cache path outside of document root. The final
* This method enables to use a cache path outside of document root. The final
* cache path is checked and created in createFinalCachDirectory(),
* called by setCache() method, which is done _after_ the cacheDirectory
* option was handled.
Expand Down Expand Up @@ -174,8 +171,7 @@ public function setCacheDirectory($cacheDirectory)
}

/**
* Create the final cache directory if it does not exist. This method
* exists in TYPO3 v4 only.
* Create the final cache directory if it does not exist.
*
* @param string $finalCacheDirectory Absolute path to final cache directory
* @throws \TYPO3\CMS\Core\Cache\Exception If directory is not writable after creation
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
<?php
namespace TYPO3\CMS\Core\Cache\Backend;

/* *
* This script belongs to the FLOW3 framework. *
* *
* It is free software; you can redistribute it and/or modify it under *
* the terms of the GNU Lesser General Public License, either version 3 *
* of the License, or (at your option) any later version. *
* *
* The TYPO3 project - inspiring people to share! *
* */
/*
* This file is part of the TYPO3 CMS project.
*
* It is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License, either version 2
* of the License, or any later version.
*
* For the full copyright and license information, please read the
* LICENSE.txt file that was distributed with this source code.
*
* The TYPO3 project - inspiring people to share!
*/

/**
* A contract for a cache backend which supports tagging.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
/**
* A caching backend which stores cache entries during one script run.
*
* This file is a backport from FLOW3
* @api
*/
class TransientMemoryBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implements TaggableBackendInterface, TransientBackendInterface
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class WincacheBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend impl
/**
* Constructs this backend
*
* @param string $context FLOW3's application context
* @param string $context Unused, for backward compatibility only
* @param array $options Configuration options
* @throws \TYPO3\CMS\Core\Cache\Exception If wincache PHP extension is not loaded
*/
Expand Down
1 change: 0 additions & 1 deletion typo3/sysext/core/Classes/Cache/CacheManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
/**
* The Cache Manager
*
* This file is a backport from FLOW3
* @api
*/
class CacheManager implements SingletonInterface
Expand Down
2 changes: 0 additions & 2 deletions typo3/sysext/core/Classes/Cache/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
/**
* A generic Cache exception
*
* This file is a backport from FLOW3
*
* @api
*/
class Exception extends \Exception
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
/**
* A "Duplicate Identifier" exception
*
* This file is a backport from FLOW3
*
* @api
*/
class DuplicateIdentifierException extends \TYPO3\CMS\Core\Cache\Exception
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
/**
* An "Invalid Backend" exception
*
* This file is a backport from FLOW3
*
* @api
*/
class InvalidBackendException extends \TYPO3\CMS\Core\Cache\Exception
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
/**
* An "Invalid Cache" exception
*
* This file is a backport from FLOW3
*
* @api
*/
class InvalidCacheException extends \TYPO3\CMS\Core\Cache\Exception
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
/**
* An "Invalid Data" exception
*
* This file is a backport from FLOW3
*
* @api
*/
class InvalidDataException extends \TYPO3\CMS\Core\Cache\Exception
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
/**
* A "No Such Cache" exception
*
* This file is a backport from FLOW3
*
* @api
*/
class NoSuchCacheException extends \TYPO3\CMS\Core\Cache\Exception
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
/**
* An abstract cache
*
* This file is a backport from FLOW3
* @api
*/
abstract class AbstractFrontend implements FrontendInterface
Expand Down
1 change: 0 additions & 1 deletion typo3/sysext/core/Classes/Cache/Frontend/PhpFrontend.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
/**
* A cache frontend tailored to PHP code.
*
* This file is a backport from FLOW3
* @api
*/
class PhpFrontend extends AbstractFrontend
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
/**
* A cache frontend for strings. Nothing else.
*
* This file is a backport from FLOW3
* @api
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10 - use VariableFrontend instead.
*/
Expand Down
1 change: 0 additions & 1 deletion typo3/sysext/core/Classes/Database/PdoHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

/**
* A helper class for handling PDO databases
* Backport of FLOW3 class PdoHelper, last synced version: 3528
*/
class PdoHelper
{
Expand Down
2 changes: 0 additions & 2 deletions typo3/sysext/core/Classes/Error/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

/**
* An exception which represents a PHP error.
*
* This file is a backport from FLOW3
*/
class Exception extends \TYPO3\CMS\Core\Exception
{
Expand Down
4 changes: 2 additions & 2 deletions typo3/sysext/core/Classes/Localization/Locales.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class Locales implements \TYPO3\CMS\Core\SingletonInterface
];

/**
* Reversed mapping with codes used by TYPO3 4.5 and below
* Reversed mapping for backward compatibility codes
*
* @var array
*/
Expand Down Expand Up @@ -116,7 +116,7 @@ class Locales implements \TYPO3\CMS\Core\SingletonInterface
];

/**
* Mapping with codes used by TYPO3 4.5 and below
* Mapping for backward compatibility codes
*
* @var array
*/
Expand Down

0 comments on commit 34f2684

Please sign in to comment.