tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10598 from creative-commoners/pulls/5/fix-basekernel

Browse Source 
API Remove deprecated CIConfig functionality
This commit is contained in:
Sabina Talipova 2022-12-01 09:55:22 +13:00 committed by GitHub
commit 12d5eb8cba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/Core/BaseKernel.php
View File

@ -21,7 +21,6 @@ use SilverStripe\Core\Manifest\ClassManifest;
use SilverStripe\Core\Manifest\ModuleLoader;
use SilverStripe\Core\Manifest\ModuleManifest;
use SilverStripe\Dev\DebugView;
use SilverStripe\Dev\Deprecation;
use SilverStripe\Logging\ErrorHandler;
use SilverStripe\View\PublicThemes;
use SilverStripe\View\SSViewer;
@ -179,26 +178,17 @@ abstract class BaseKernel implements Kernel
*/
protected function bootManifests($flush)
{
// Setup autoloader
$ignoredCIConfigs = Deprecation::withNoReplacement(function () {
return $this->getIgnoredCIConfigs();
});
Deprecation::withNoReplacement(function () use ($flush, $ignoredCIConfigs) {
$this->getClassLoader()->init(
$this->getIncludeTests(),
$flush,
$ignoredCIConfigs
);
// Find modules
$this->getModuleLoader()->init(
$this->getIncludeTests(),
$flush,
$ignoredCIConfigs
);
});
$this->getClassLoader()->init(
$this->getIncludeTests(),
$flush
);
// Find modules
$this->getModuleLoader()->init(
$this->getIncludeTests(),
$flush
);
// Flush config
if ($flush) {
$config = $this->getConfigLoader()->getManifest();
@ -215,13 +205,10 @@ abstract class BaseKernel implements Kernel
$defaultSet->setProject(
ModuleManifest::config()->get('project')
);
Deprecation::withNoReplacement(function () use ($defaultSet, $flush, $ignoredCIConfigs) {
$defaultSet->init(
$this->getIncludeTests(),
$flush,
$ignoredCIConfigs
);
});
$defaultSet->init(
$this->getIncludeTests(),
$flush
);
}
}
@ -230,15 +217,8 @@ abstract class BaseKernel implements Kernel
*/
protected function bootConfigs()
{
global $project;
$projectBefore = $project;
$config = ModuleManifest::config();
// After loading all other app manifests, include _config.php files
$this->getModuleLoader()->getManifest()->activateConfig();
if ($project && $project !== $projectBefore) {
Deprecation::notice('5.0', '$project global is deprecated');
$config->set('project', $project);
}
}
/**

20
src/Core/Manifest/ClassLoader.php
View File

@ -2,9 +2,6 @@
namespace SilverStripe\Core\Manifest;
use SilverStripe\Core\ClassInfo;
use SilverStripe\Dev\Deprecation;
/**
* A class that handles loading classes and interfaces from a class manifest
* instance.
@ -126,24 +123,9 @@ class ClassLoader
foreach ($this->manifests as $manifest) {
/** @var ClassManifest $instance */
$instance = $manifest['instance'];
Deprecation::withNoReplacement(function () use ($instance, $includeTests, $forceRegen, $ignoredCIConfigs) {
$instance->init($includeTests, $forceRegen, $ignoredCIConfigs);
});
$instance->init($includeTests, $forceRegen);
}
$this->registerAutoloader();
}
/**
* Returns true if a class or interface name exists in the manifest.
*
* @param string $class
* @return bool
* @deprecated 4.0.1 Use ClassInfo::exists() instead
*/
public function classExists($class)
{
Deprecation::notice('4.0.1', 'Use ClassInfo::exists() instead');
return ClassInfo::exists($class);
}
}

4
src/Core/Manifest/ClassManifest.php
View File

@ -291,9 +291,7 @@ class ClassManifest
}
// Build
Deprecation::withNoReplacement(function () use ($includeTests, $ignoredCIConfigs) {
$this->regenerate($includeTests, $ignoredCIConfigs);
});
$this->regenerate($includeTests);
}
/**