Legacy "include" fragments have been removed

diff --git a/Doxyfile b/Doxyfile
index dc89acd44ddc07bc2a3d6627ee734b20a03de972..50590bb6be54ac366564d816e05acadfcbf1897e 100644 (file)
--- a/Doxyfile
+++ b/Doxyfile
@@ -1,4 +1,4 @@
-INPUT = README.md index.php update.php bin/ mod/ include/ view/ src/ VERSION
+INPUT = README.md index.php update.php bin/ mod/ view/ src/ VERSION
 RECURSIVE = YES
 PROJECT_NAME = "Friendica"
 PROJECT_LOGO = images/friendica-64.png

diff --git a/src/Console/Extract.php b/src/Console/Extract.php
index 23b2c3c546865ffe36b5361f801d8f46def02289..4e6b1bff5ac2b524a14fed73fe6e300162dcc445 100644 (file)
--- a/src/Console/Extract.php
+++ b/src/Console/Extract.php
@@ -77,7 +77,6 @@ HELP;
                $files = array_merge(
                        ['index.php'],
                        glob('mod/*'),
-                       glob('include/*'),
                        glob('addon/*/*'),
                        $this->globRecursive('src')
                );

diff --git a/src/Console/Typo.php b/src/Console/Typo.php
index 4414662e7f4b150d96f9fad4fb419d13d9c162b8..e21b394c06beb7f981294df042cbe4e310869256 100644 (file)
--- a/src/Console/Typo.php
+++ b/src/Console/Typo.php
@@ -105,13 +105,6 @@ HELP;
                $files = glob('mod/*.php');
                $this->checkFiles($php_path, $files);
 
-               if ($this->getOption('v')) {
-                       $this->out('Directory: include');
-               }
-
-               $files = glob('include/*.php');
-               $this->checkFiles($php_path, $files);
-
                if ($this->getOption('v')) {
                        $this->out('Directory: addon');
                }

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 9ec2f8f04aba814588af9212607705c1025088a9..96f3e7ae042e30fae459cff6ca272d6f1bdba261 100644 (file)
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -315,17 +315,7 @@ class Worker
                        return false;
                }
 
-               $valid = false;
-               if (strpos($file, 'include/') === 0) {
-                       $valid = true;
-               }
-
-               if (strpos($file, 'addon/') === 0) {
-                       $valid = true;
-               }
-
-               // Simply return flag
-               return $valid;
+               return (strpos($file, 'addon/') === 0);
        }
 
        /**
@@ -406,11 +396,6 @@ class Worker
                        return true;
                }
 
-               // The script could be provided as full path or only with the function name
-               if ($include == basename($include)) {
-                       $include = 'include/' . $include . '.php';
-               }
-
                if (!self::validateInclude($include)) {
                        Logger::warning('Include file is not valid', ['file' => $argv[0]]);
                        $stamp = (float)microtime(true);

diff --git a/src/Navigation/Notifications/Repository/Notify.php b/src/Navigation/Notifications/Repository/Notify.php
index 315b2e084ca5b23b8fbca7925dfc8acbcc591469..5a6bf668967fcc8d10a81824e8e1d0bb9202d80f 100644 (file)
--- a/src/Navigation/Notifications/Repository/Notify.php
+++ b/src/Navigation/Notifications/Repository/Notify.php
@@ -585,7 +585,7 @@ class Notify extends BaseRepository
                                        DBA::insert('notify-threads', $fields);
 
                                        $emailBuilder->setHeader('Message-ID', $message_id);
-                                       $log_msg = "include/enotify: No previous notification found for this parent:\n" .
+                                       $log_msg = "No previous notification found for this parent:\n" .
                                                "  parent: ${params['parent']}\n" . "  uid   : ${params['uid']}\n";
                                        $this->logger->info($log_msg);
                                } else {