Continued:

- fixed remove-deprecated.sh (was still Subversion-related)
- removed deprecated files
- updated TODOs.txt

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/application/tests/data.php b/application/tests/data.php
deleted file mode 100644 (file)
index 7d6dcee..0000000
--- a/application/tests/data.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// @DEPRECATED

diff --git a/application/tests/init.php b/application/tests/init.php
deleted file mode 100644 (file)
index 7d6dcee..0000000
--- a/application/tests/init.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// @DEPRECATED

diff --git a/application/tests/loader.php b/application/tests/loader.php
deleted file mode 100644 (file)
index 7d6dcee..0000000
--- a/application/tests/loader.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// @DEPRECATED

diff --git a/application/tests/starter.php b/application/tests/starter.php
deleted file mode 100644 (file)
index 7d6dcee..0000000
--- a/application/tests/starter.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// @DEPRECATED

diff --git a/contrib/remove-deprecated.sh b/contrib/remove-deprecated.sh
index d075762bad21cc5308d19dea86629bf78a1c14b7..049b30e3e347afa835206a60206704c9df67e134 100755 (executable)
--- a/contrib/remove-deprecated.sh
+++ b/contrib/remove-deprecated.sh
@@ -1,16 +1,15 @@
 #!/bin/sh
 
-if ! test -e "svn-externals.txt"; then
-  echo "$0: Please execute this script from root directory."
-  exit 1
+if ! test -e ".gitignore"; then
+       echo "$0: Please execute this script from root directory."
+       exit 1
 fi
 
 echo "$0: Searching for deprecated PHP scripts ..."
-LIST1=`find -type f -name "*.php" -size 24c -exec grep -H "@DEPRECATED" {} \;`
+LIST=$(find -type f -name "*.php" -size 21c -exec grep -H "@DEPRECATED" {} \; | grep -v "/core/" | cut -d ":" -f 1)
 
-LIST="${LIST1} ${LIST2}"
-
-if test "${LIST}" != " "; then
-       echo "${LIST}" | cut -d ":" -f 1 | xargs git rm --force
-       sh ./todo-builder.sh
+if [ -n "${LIST}" ]
+then
+       echo "${LIST}" | xargs git rm --force
+       sh ./contrib/todo-builder.sh
 fi

diff --git a/docs/TODOs.txt b/docs/TODOs.txt
index 8ffdd7489de29d8d996c2c49e671baddb8087b51..456ea29e3bdf3bd921d0a57bcc761bd1638a4888 100644 (file)
--- a/docs/TODOs.txt
+++ b/docs/TODOs.txt
@@ -34,7 +34,7 @@
 ./framework/main/classes/criteria/search/class_SearchCriteria.php:77:   * @todo        Find a nice casting here. (int) allows until and including 32766.
 ./framework/main/classes/crypto/class_CryptoHelper.php:104:            // @TODO Maybe rewrite this with DirectoryIterator, similar to Compressor thing?
 ./framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php:340:    * @todo        Do some checks on the database directory and files here
-./framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php:629:    * @todo        Add more generic non-public data for removal
+./framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php:632:    * @todo        Add more generic non-public data for removal
 ./framework/main/classes/database/class_BaseDatabaseWrapper.php:214:           // @TODO Minor: Update above comment to e.g. BaseDatabaseResult
 ./framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php:17: * @todo           Add missing own interface for public methods
 ./framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php:17: * @todo               Add missing own interface for public methods
@@ -154,29 +154,16 @@
 ./framework/main/third_party/api/wernisportal/class_WernisApi.php:16: * @todo          Out-dated since 0.6-BETA
 ./index.php:58:         * @todo        This method is old code and needs heavy rewrite and should be moved to ApplicationHelper
 ### ### DEPRECATION FOLLOWS: ### ###
-./application/tests/data.php:2:// @DEPRECATED
-./application/tests/init.php:2:// @DEPRECATED
-./application/tests/loader.php:2:// @DEPRECATED
-./application/tests/starter.php:2:// @DEPRECATED
-./framework/classes.php:2:// @DEPRECATED
-./framework/config/config-hubmaster.php:2:// @DEPRECATED
-./framework/database/lib-lfdb.php:2:// @DEPRECATED
-./framework/database.php:2:// @DEPRECATED
-./framework/includes.php:2:// @DEPRECATED
 ./framework/main/classes/class_BaseFrameworkSystem.php:1846:    * @deprecated  Not fully, as the new Logger facilities are not finished yet.
 ./framework/main/exceptions/base64/class_Base64EncodingBadException.php:17: * @deprecated      Don't use this anymore
 ./framework/main/exceptions/base64/class_Base64EncodingModuloException.php:16: * @deprecated   Don't use this anymore
-./framework/main/exceptions/config/class_ConfigEntryIsEmptyException.php:2:// @DEPRECATED
 ./framework/main/exceptions/crypto/class_EncryptInvalidLengthException.php:17: * @deprecated   Don't use this anymore
 ./framework/main/exceptions/crypto/class_EncryptMissingException.php:17: * @deprecated Don't use this anymore
-./framework/main/exceptions/database/local_file/class_SavePathIsEmptyException.php:2:// @DEPRECATED
 ./framework/main/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php:16: * @deprecated     Don't use this
 ./framework/main/exceptions/database/local_file/class_SavePathReadProtectedException.php:16: * @deprecated     Please don't use this
 ./framework/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php:16: * @deprecated    Please don't use this
-./framework/main/exceptions/file_directory/class_FileIsEmptyException.php:2:// @DEPRECATED
 ./framework/main/exceptions/file_directory/class_InvalidDataLengthException.php:16: * @deprecated      Don't use this anymore
 ./framework/main/exceptions/file_directory/class_InvalidMD5ChecksumException.php:16: * @deprecated     Don't use this anymore
-./framework/main/exceptions/file_directory/class_PathIsEmptyException.php:2:// @DEPRECATED
 ./framework/main/exceptions/file_directory/class_PathIsNoDirectoryException.php:16: * @deprecated      Don't use this anymore
 ./framework/main/exceptions/file_directory/class_PathReadProtectedException.php:16: * @deprecated      Don't use this anymore
 ./framework/main/exceptions/filter/class_InvalidFilterChainException.php:16: * @deprecated     Don't use this anymore
@@ -190,22 +177,15 @@
 ./framework/main/exceptions/helper/class_NoGroupOpenedException.php:16: * @deprecated  Don't use this anymore
 ./framework/main/exceptions/helper/class_UserInstanceMissingException.php:16: * @deprecated    Don't use this anymore
 ./framework/main/exceptions/language/class_InvalidLanguagePathStringException.php:16: * @deprecated    Don't use this anymore
-./framework/main/exceptions/language/class_LanguagePathIsEmptyException.php:2:// @DEPRECATED
 ./framework/main/exceptions/language/class_LanguagePathReadProtectedException.php:16: * @deprecated    Don't use this anymore
 ./framework/main/exceptions/main/class_DimNotFoundInArrayException.php:17: * @deprecated       Please don't use this anymore
-./framework/main/exceptions/main/class_EmptyVariableException.php:2:// @DEPRECATED
 ./framework/main/exceptions/main/class_InvalidArrayCountException.php:16: * @deprecated        Don't use this anymore
 ./framework/main/exceptions/main/class_InvalidClassNameException.php:17: * @deprecated Don't use this anymore
-./framework/main/exceptions/main/class_InvalidCommandInstanceException.php:2:// @DEPRECATED
 ./framework/main/exceptions/main/class_InvalidObjectException.php:17: * @deprecated    Don't use this anymore
 ./framework/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php:16: * @deprecated        Don't use this anymore
-./framework/main/exceptions/main/class_MissingMethodException.php:2:// @DEPRECATED
 ./framework/main/exceptions/main/class_VariableIsNotSetException.php:16: * @deprecated Don't use this anymore
 ./framework/main/exceptions/stacker/class_EmptyStackerException.php:16: * @deprecated  Don't use this anymore
-./framework/main/exceptions/template/class_BasePathIsEmptyException.php:2:// @DEPRECATED
 ./framework/main/exceptions/template/class_BasePathReadProtectedException.php:16: * @deprecated        Don't use this anymore
-./framework/main/exceptions/template/class_InvalidBasePathStringException.php:2:// @DEPRECATED
 ./framework/main/exceptions/template/class_NoVariableException.php:16: * @deprecated   Don't use this anymore
 ./framework/main/exceptions/template/class_UnexpectedTemplateTypeException.php:16: * @deprecated       Don't use this anymore
 ./framework/main/middleware/debug/class_DebugMiddleware.php:22: * @deprecated  See LoggerFactory for a more flexible approach
-./framework/selector.php:2:// @DEPRECATED

diff --git a/framework/classes.php b/framework/classes.php
deleted file mode 100644 (file)
index 7d6dcee..0000000
--- a/framework/classes.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// @DEPRECATED

diff --git a/framework/config/config-hubmaster.php b/framework/config/config-hubmaster.php
deleted file mode 100644 (file)
index 7d6dcee..0000000
--- a/framework/config/config-hubmaster.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// @DEPRECATED

diff --git a/framework/database.php b/framework/database.php
deleted file mode 100644 (file)
index 7d6dcee..0000000
--- a/framework/database.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// @DEPRECATED

diff --git a/framework/database/lib-lfdb.php b/framework/database/lib-lfdb.php
deleted file mode 100644 (file)
index 7d6dcee..0000000
--- a/framework/database/lib-lfdb.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// @DEPRECATED

diff --git a/framework/includes.php b/framework/includes.php
deleted file mode 100644 (file)
index 7d6dcee..0000000
--- a/framework/includes.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// @DEPRECATED

diff --git a/framework/main/exceptions/config/class_ConfigEntryIsEmptyException.php b/framework/main/exceptions/config/class_ConfigEntryIsEmptyException.php
deleted file mode 100644 (file)
index 7d6dcee..0000000
--- a/framework/main/exceptions/config/class_ConfigEntryIsEmptyException.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// @DEPRECATED

diff --git a/framework/main/exceptions/database/local_file/class_SavePathIsEmptyException.php b/framework/main/exceptions/database/local_file/class_SavePathIsEmptyException.php
deleted file mode 100644 (file)
index 7d6dcee..0000000
--- a/framework/main/exceptions/database/local_file/class_SavePathIsEmptyException.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// @DEPRECATED

diff --git a/framework/main/exceptions/file_directory/class_FileIsEmptyException.php b/framework/main/exceptions/file_directory/class_FileIsEmptyException.php
deleted file mode 100644 (file)
index 7d6dcee..0000000
--- a/framework/main/exceptions/file_directory/class_FileIsEmptyException.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// @DEPRECATED

diff --git a/framework/main/exceptions/file_directory/class_PathIsEmptyException.php b/framework/main/exceptions/file_directory/class_PathIsEmptyException.php
deleted file mode 100644 (file)
index 7d6dcee..0000000
--- a/framework/main/exceptions/file_directory/class_PathIsEmptyException.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// @DEPRECATED

diff --git a/framework/main/exceptions/language/class_LanguagePathIsEmptyException.php b/framework/main/exceptions/language/class_LanguagePathIsEmptyException.php
deleted file mode 100644 (file)
index 7d6dcee..0000000
--- a/framework/main/exceptions/language/class_LanguagePathIsEmptyException.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// @DEPRECATED

diff --git a/framework/main/exceptions/main/class_EmptyVariableException.php b/framework/main/exceptions/main/class_EmptyVariableException.php
deleted file mode 100644 (file)
index 7d6dcee..0000000
--- a/framework/main/exceptions/main/class_EmptyVariableException.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// @DEPRECATED

diff --git a/framework/main/exceptions/main/class_InvalidCommandInstanceException.php b/framework/main/exceptions/main/class_InvalidCommandInstanceException.php
deleted file mode 100644 (file)
index 7d6dcee..0000000
--- a/framework/main/exceptions/main/class_InvalidCommandInstanceException.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// @DEPRECATED

diff --git a/framework/main/exceptions/main/class_MissingMethodException.php b/framework/main/exceptions/main/class_MissingMethodException.php
deleted file mode 100644 (file)
index 7d6dcee..0000000
--- a/framework/main/exceptions/main/class_MissingMethodException.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// @DEPRECATED

diff --git a/framework/main/exceptions/template/class_BasePathIsEmptyException.php b/framework/main/exceptions/template/class_BasePathIsEmptyException.php
deleted file mode 100644 (file)
index 7d6dcee..0000000
--- a/framework/main/exceptions/template/class_BasePathIsEmptyException.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// @DEPRECATED

diff --git a/framework/main/exceptions/template/class_InvalidBasePathStringException.php b/framework/main/exceptions/template/class_InvalidBasePathStringException.php
deleted file mode 100644 (file)
index 7d6dcee..0000000
--- a/framework/main/exceptions/template/class_InvalidBasePathStringException.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// @DEPRECATED

diff --git a/framework/selector.php b/framework/selector.php
deleted file mode 100644 (file)
index 7d6dcee..0000000
--- a/framework/selector.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// @DEPRECATED