Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorStefan Giehl <stefan@piwik.org>2017-11-14 12:15:56 +0300
committerGitHub <noreply@github.com>2017-11-14 12:15:56 +0300
commit016634913d642bd5fadb4ecd00afa4eda4c85c02 (patch)
treee0dc49c1c1dfb99499a0a42ca7fb57172d9c9d25 /core
parent4fc3de649fbab314a920687634d9d365f64ccb2e (diff)
Move list of ignored files for integrity check to config.php (using DI) (#12274)
Diffstat (limited to 'core')
-rw-r--r--core/FileIntegrity.php43
1 files changed, 2 insertions, 41 deletions
diff --git a/core/FileIntegrity.php b/core/FileIntegrity.php
index abe3bc31fe..1725868e51 100644
--- a/core/FileIntegrity.php
+++ b/core/FileIntegrity.php
@@ -9,6 +9,7 @@
namespace Piwik;
+use Piwik\Container\StaticContainer;
use Piwik\Plugins\CustomPiwikJs\Exception\AccessDeniedException;
use Piwik\Plugins\CustomPiwikJs\TrackerUpdater;
@@ -56,47 +57,7 @@ class FileIntegrity
protected static function getFilesNotInManifestButExpectedAnyway()
{
- return array(
- '*.htaccess',
- '*web.config',
- 'bootstrap.php',
- 'favicon.ico',
- 'robots.txt',
- '.bowerrc',
- '.phpstorm.meta.php',
- 'config/config.ini.php',
- 'config/config.php',
- 'config/common.ini.php',
- 'config/*.config.ini.php',
- 'config/manifest.inc.php',
- 'misc/*.dat',
- 'misc/*.dat.gz',
- 'misc/*.bin',
- 'misc/user/*png',
- 'misc/user/*js',
- 'misc/package',
- 'misc/package/WebAppGallery/*.xml',
- 'misc/package/WebAppGallery/install.sql',
- 'plugins/ImageGraph/fonts/unifont.ttf',
- 'vendor/autoload.php',
- 'vendor/composer/autoload_real.php',
- 'vendor/szymach/c-pchart/app/*',
- 'tmp/*',
- // Search engine sites verification
- 'google*.html',
- 'BingSiteAuth.xml',
- 'yandex*.html',
- // Files below are not expected but they used to be present in older Piwik versions and may be still here
- // As they are not going to cause any trouble we won't report them as 'File to delete'
- '*.coveralls.yml',
- '*.scrutinizer.yml',
- '*.gitignore',
- '*.gitkeep',
- '*.gitmodules',
- '*.gitattributes',
- '*.bower.json',
- '*.travis.yml',
- );
+ return StaticContainer::get('fileintegrity.ignore');
}
protected static function getMessagesDirectoriesFoundButNotExpected($messages)