Skip to content

[6.x] Deprecations#11955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasonvarga merged 6 commits into from
Jul 14, 2025
Merged

[6.x] Deprecations #11955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
90a4d8c
Drop `filterSortAndPaginate` method on `ApiController`
duncanmcclean Jul 14, 2025
6a89fbc
Drop `export_as` option for starter kits.
duncanmcclean Jul 14, 2025
8234686
Drop `statamic` cache driver
duncanmcclean Jul 14, 2025
b15db77
Drop `addLocalization` method on `Entry`
duncanmcclean Jul 14, 2025
e7c3c3c
Fix starter kit tests
duncanmcclean Jul 14, 2025
1e64943
Remove other references to `export_as`
duncanmcclean Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions src/Entries/Entry.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -821,14 +821,6 @@ public function existsIn($locale)
return $this->in($locale) !== null;
}

/** @deprecated */
public function addLocalization($entry)
{
$entry->origin($this);

return $this;
}

public function makeLocalization($site)
{
$localization = Facades\Entry::make()
Expand Down
13 changes: 0 additions & 13 deletions src/Http/Controllers/API/ApiController.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -77,19 +77,6 @@ protected function filterAllowedResources($items)
return $items->filter(fn ($item) => in_array($item->handle(), $allowedResources));
}

/**
* Filter, sort, and paginate query for API resource output.
*
* @param \Statamic\Query\Builder $query
* @return \Statamic\Extensions\Pagination\LengthAwarePaginator
*
* @deprecated
*/
protected function filterSortAndPaginate($query)
{
return $this->updateAndPaginate($query);
}

/**
* Filter, sort, scope, and paginate query for API resource output.
*
Expand Down
9 changes: 0 additions & 9 deletions src/Providers/CacheServiceProvider.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,15 +37,6 @@ public function boot()
private function extendFileStore()
{
$this->app->booting(function () {
/** @deprecated */
Cache::extend('statamic', function () {
return Cache::repository(new FileStore(
$this->app['files'],
$this->app['config']['cache.stores.file']['path'],
$this->app['config']['cache.stores.file']['permission'] ?? null
), $this->app['config']['cache.stores.file']);
});

// Don't extend the file store if it's already being extended.
$creators = (fn () => $this->customCreators)->call(Cache::getFacadeRoot());
if (isset($creators['file'])) {
Expand Down
20 changes: 3 additions & 17 deletions src/StarterKits/ExportableModule.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,14 +36,6 @@ public function export(string $starterKitPath): void
from: $path,
starterKitPath: $starterKitPath,
));

$this
->exportAsPaths()
->each(fn ($to, $from) => $this->exportRelativePath(
from: $from,
to: $to,
starterKitPath: $starterKitPath,
));
}

public function versionDependencies(): self
Expand DownExpand Up@@ -105,18 +97,13 @@ protected function exportDependenciesFromComposerRequire(string $requireKey, Col
*/
protected function ensureNotExportingComposerJson(): self
{
// Here we'll ensure both `export_as` values and keys are included,
// because we want to make sure `composer.json` is referenced on either end.
$flattenedExportPaths = $this
->exportPaths()
->merge($this->exportAsPaths())
->merge($this->exportAsPaths()->keys());
$paths = $this->exportPaths();

if ($flattenedExportPaths->contains('starter-kit.yaml')) {
if ($paths->contains('starter-kit.yaml')) {
throw new StarterKitException('Cannot export [starter-kit.yaml] config.');
}

if ($flattenedExportPaths->contains('composer.json')) {
if ($paths->contains('composer.json')) {
throw new StarterKitException('Cannot export [composer.json]. Please use `dependencies` array.');
}

Expand All@@ -132,7 +119,6 @@ protected function ensureExportablePathsExist(): self
{
$this
->exportPaths()
->merge($this->exportAsPaths()->keys())
->reject(fn ($path) => $this->files->exists(base_path($path)))
->each(function ($path) {
throw new StarterKitException("Cannot export [{$path}], because it does not exist in your app.");
Expand Down
1 change: 0 additions & 1 deletion src/StarterKits/Exporter.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -205,7 +205,6 @@ protected function syncConfigWithModules(): Collection

$normalizedModuleKeyOrder = [
'export_paths',
'export_as',
'dependencies',
'dependencies_dev',
'modules',
Expand Down
12 changes: 1 addition & 11 deletions src/StarterKits/InstallableModule.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,18 +104,9 @@ protected function installDependencies(): self
*/
protected function installableFiles(): Collection
{
$installableFromExportPaths = $this
return $this
->exportPaths()
->flatMap(fn ($path) => $this->expandExportDirectoriesToFiles($path));

$installableFromExportAsPaths = $this
->exportAsPaths()
->flip()
->flatMap(fn ($to, $from) => $this->expandExportDirectoriesToFiles($to, $from));

return collect()
->merge($installableFromExportPaths)
->merge($installableFromExportAsPaths);
}

/**
Expand DownExpand Up@@ -196,7 +187,6 @@ protected function ensureInstallableFilesExist(): self
{
$this
->exportPaths()
->merge($this->exportAsPaths())
->reject(fn ($path) => $this->files->exists($this->installableFilesPath($path)))
->each(function ($path) {
throw new StarterKitException("Starter kit path [{$path}] does not exist.");
Expand Down
13 changes: 0 additions & 13 deletions src/StarterKits/Module.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,18 +62,6 @@ protected function exportPaths(): Collection
return collect($this->config('export_paths') ?? []);
}

/**
* Get `export_as` paths (to be renamed on install) as collection from config.
*
* This is only here for backwards compatibility. Use new `export` folder convention instead.
*
* @deprecated
*/
protected function exportAsPaths(): Collection
{
return collect($this->config('export_as') ?? []);
}

/**
* Ensure nested module config is not empty.
*
Expand All@@ -82,7 +70,6 @@ protected function exportAsPaths(): Collection
protected function ensureModuleConfigNotEmpty(): self
{
$hasConfig = $this->config()->has('export_paths')
|| $this->config()->has('export_as')
|| $this->config()->has('dependencies')
|| $this->config()->has('dependencies_dev')
|| $this->config()->has('modules');
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[6.x] Deprecations by duncanmcclean · Pull Request #11955 · statamic/cms · GitHub
Skip to content
[6.x] Deprecations#11955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 6 commits into

from

Jul 14, 2025
 Merged


[6.x] Deprecations
#11955
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
90a4d8c

Drop `filterSortAndPaginate` method on `ApiController`


duncanmcclean Jul 14, 2025
6a89fbc

Drop `export_as` option for starter kits.


duncanmcclean Jul 14, 2025
8234686

Drop `statamic` cache driver


duncanmcclean Jul 14, 2025
b15db77

Drop `addLocalization` method on `Entry`


duncanmcclean Jul 14, 2025
e7c3c3c

Fix starter kit tests


duncanmcclean Jul 14, 2025
1e64943

Remove other references to `export_as`


duncanmcclean Jul 14, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 0 additions & 8 deletions
src/Entries/Entry.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -821,14 +821,6 @@ public function existsIn($locale)
 return $this->in($locale) !== null;
 }

 /** @deprecated */
 public function addLocalization($entry)
 {
 $entry->origin($this);

 return $this;
 }

 public function makeLocalization($site)
 {
 $localization = Facades\Entry::make()
Expand Down

13 changes: 0 additions & 13 deletions
src/Http/Controllers/API/ApiController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,19 +77,6 @@ protected function filterAllowedResources($items)
 return $items->filter(fn ($item) => in_array($item->handle(), $allowedResources));
 }

 /**
 * Filter, sort, and paginate query for API resource output.
 *
 * @param \Statamic\Query\Builder $query
 * @return \Statamic\Extensions\Pagination\LengthAwarePaginator
 *
 * @deprecated
 */
 protected function filterSortAndPaginate($query)
 {
 return $this->updateAndPaginate($query);
 }

 /**
 * Filter, sort, scope, and paginate query for API resource output.
 *
Expand Down

9 changes: 0 additions & 9 deletions
src/Providers/CacheServiceProvider.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,15 +37,6 @@ public function boot()
 private function extendFileStore()
 {
 $this->app->booting(function () {
 /** @deprecated */
 Cache::extend('statamic', function () {
 return Cache::repository(new FileStore(
 $this->app['files'],
 $this->app['config']['cache.stores.file']['path'],
 $this->app['config']['cache.stores.file']['permission'] ?? null
 ), $this->app['config']['cache.stores.file']);
 });

 // Don't extend the file store if it's already being extended.
 $creators = (fn () => $this->customCreators)->call(Cache::getFacadeRoot());
 if (isset($creators['file'])) {
Expand Down

20 changes: 3 additions & 17 deletions
src/StarterKits/ExportableModule.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,14 +36,6 @@ public function export(string $starterKitPath): void
 from: $path,
 starterKitPath: $starterKitPath,
 ));

 $this
 ->exportAsPaths()
 ->each(fn ($to, $from) => $this->exportRelativePath(
 from: $from,
 to: $to,
 starterKitPath: $starterKitPath,
 ));
 }

 public function versionDependencies(): self
Expand DownExpand Up@@ -105,18 +97,13 @@ protected function exportDependenciesFromComposerRequire(string $requireKey, Col
 */
 protected function ensureNotExportingComposerJson(): self
 {
 // Here we'll ensure both `export_as` values and keys are included,
 // because we want to make sure `composer.json` is referenced on either end.
 $flattenedExportPaths = $this
 ->exportPaths()
 ->merge($this->exportAsPaths())
 ->merge($this->exportAsPaths()->keys());
 $paths = $this->exportPaths();

 if ($flattenedExportPaths->contains('starter-kit.yaml')) {
 if ($paths->contains('starter-kit.yaml')) {
 throw new StarterKitException('Cannot export [starter-kit.yaml] config.');
 }

 if ($flattenedExportPaths->contains('composer.json')) {
 if ($paths->contains('composer.json')) {
 throw new StarterKitException('Cannot export [composer.json]. Please use `dependencies` array.');
 }

Expand All@@ -132,7 +119,6 @@ protected function ensureExportablePathsExist(): self
 {
 $this
 ->exportPaths()
 ->merge($this->exportAsPaths()->keys())
 ->reject(fn ($path) => $this->files->exists(base_path($path)))
 ->each(function ($path) {
 throw new StarterKitException("Cannot export [{$path}], because it does not exist in your app.");
Expand Down

1 change: 0 additions & 1 deletion
src/StarterKits/Exporter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,7 +205,6 @@ protected function syncConfigWithModules(): Collection

 $normalizedModuleKeyOrder = [
 'export_paths',
 'export_as',
 'dependencies',
 'dependencies_dev',
 'modules',
Expand Down

12 changes: 1 addition & 11 deletions
src/StarterKits/InstallableModule.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,18 +104,9 @@ protected function installDependencies(): self
 */
 protected function installableFiles(): Collection
 {
$installableFromExportPaths = $this
return $this
 ->exportPaths()
 ->flatMap(fn ($path) => $this->expandExportDirectoriesToFiles($path));

 $installableFromExportAsPaths = $this
 ->exportAsPaths()
 ->flip()
 ->flatMap(fn ($to, $from) => $this->expandExportDirectoriesToFiles($to, $from));

 return collect()
 ->merge($installableFromExportPaths)
 ->merge($installableFromExportAsPaths);
 }

 /**
Expand DownExpand Up@@ -196,7 +187,6 @@ protected function ensureInstallableFilesExist(): self
 {
 $this
 ->exportPaths()
 ->merge($this->exportAsPaths())
 ->reject(fn ($path) => $this->files->exists($this->installableFilesPath($path)))
 ->each(function ($path) {
 throw new StarterKitException("Starter kit path [{$path}] does not exist.");
Expand Down

13 changes: 0 additions & 13 deletions
src/StarterKits/Module.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,18 +62,6 @@ protected function exportPaths(): Collection
 return collect($this->config('export_paths') ?? []);
 }

 /**
 * Get `export_as` paths (to be renamed on install) as collection from config.
 *
 * This is only here for backwards compatibility. Use new `export` folder convention instead.
 *
 * @deprecated
 */
 protected function exportAsPaths(): Collection
 {
 return collect($this->config('export_as') ?? []);
 }

 /**
 * Ensure nested module config is not empty.
 *
Expand All@@ -82,7 +70,6 @@ protected function exportAsPaths(): Collection
 protected function ensureModuleConfigNotEmpty(): self
 {
 $hasConfig = $this->config()->has('export_paths')
 || $this->config()->has('export_as')
 || $this->config()->has('dependencies')
 || $this->config()->has('dependencies_dev')
 || $this->config()->has('modules');
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[6.x] Deprecations by duncanmcclean · Pull Request #11955 · statamic/cms · GitHub
Skip to content
[6.x] Deprecations#11955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 6 commits into

from

Jul 14, 2025
 Merged


[6.x] Deprecations
#11955
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
90a4d8c

Drop `filterSortAndPaginate` method on `ApiController`


duncanmcclean Jul 14, 2025
6a89fbc

Drop `export_as` option for starter kits.


duncanmcclean Jul 14, 2025
8234686

Drop `statamic` cache driver


duncanmcclean Jul 14, 2025
b15db77

Drop `addLocalization` method on `Entry`


duncanmcclean Jul 14, 2025
e7c3c3c

Fix starter kit tests


duncanmcclean Jul 14, 2025
1e64943

Remove other references to `export_as`


duncanmcclean Jul 14, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 0 additions & 8 deletions
src/Entries/Entry.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -821,14 +821,6 @@ public function existsIn($locale)
 return $this->in($locale) !== null;
 }

 /** @deprecated */
 public function addLocalization($entry)
 {
 $entry->origin($this);

 return $this;
 }

 public function makeLocalization($site)
 {
 $localization = Facades\Entry::make()
Expand Down

13 changes: 0 additions & 13 deletions
src/Http/Controllers/API/ApiController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,19 +77,6 @@ protected function filterAllowedResources($items)
 return $items->filter(fn ($item) => in_array($item->handle(), $allowedResources));
 }

 /**
 * Filter, sort, and paginate query for API resource output.
 *
 * @param \Statamic\Query\Builder $query
 * @return \Statamic\Extensions\Pagination\LengthAwarePaginator
 *
 * @deprecated
 */
 protected function filterSortAndPaginate($query)
 {
 return $this->updateAndPaginate($query);
 }

 /**
 * Filter, sort, scope, and paginate query for API resource output.
 *
Expand Down

9 changes: 0 additions & 9 deletions
src/Providers/CacheServiceProvider.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,15 +37,6 @@ public function boot()
 private function extendFileStore()
 {
 $this->app->booting(function () {
 /** @deprecated */
 Cache::extend('statamic', function () {
 return Cache::repository(new FileStore(
 $this->app['files'],
 $this->app['config']['cache.stores.file']['path'],
 $this->app['config']['cache.stores.file']['permission'] ?? null
 ), $this->app['config']['cache.stores.file']);
 });

 // Don't extend the file store if it's already being extended.
 $creators = (fn () => $this->customCreators)->call(Cache::getFacadeRoot());
 if (isset($creators['file'])) {
Expand Down

20 changes: 3 additions & 17 deletions
src/StarterKits/ExportableModule.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,14 +36,6 @@ public function export(string $starterKitPath): void
 from: $path,
 starterKitPath: $starterKitPath,
 ));

 $this
 ->exportAsPaths()
 ->each(fn ($to, $from) => $this->exportRelativePath(
 from: $from,
 to: $to,
 starterKitPath: $starterKitPath,
 ));
 }

 public function versionDependencies(): self
Expand DownExpand Up@@ -105,18 +97,13 @@ protected function exportDependenciesFromComposerRequire(string $requireKey, Col
 */
 protected function ensureNotExportingComposerJson(): self
 {
 // Here we'll ensure both `export_as` values and keys are included,
 // because we want to make sure `composer.json` is referenced on either end.
 $flattenedExportPaths = $this
 ->exportPaths()
 ->merge($this->exportAsPaths())
 ->merge($this->exportAsPaths()->keys());
 $paths = $this->exportPaths();

 if ($flattenedExportPaths->contains('starter-kit.yaml')) {
 if ($paths->contains('starter-kit.yaml')) {
 throw new StarterKitException('Cannot export [starter-kit.yaml] config.');
 }

 if ($flattenedExportPaths->contains('composer.json')) {
 if ($paths->contains('composer.json')) {
 throw new StarterKitException('Cannot export [composer.json]. Please use `dependencies` array.');
 }

Expand All@@ -132,7 +119,6 @@ protected function ensureExportablePathsExist(): self
 {
 $this
 ->exportPaths()
 ->merge($this->exportAsPaths()->keys())
 ->reject(fn ($path) => $this->files->exists(base_path($path)))
 ->each(function ($path) {
 throw new StarterKitException("Cannot export [{$path}], because it does not exist in your app.");
Expand Down

1 change: 0 additions & 1 deletion
src/StarterKits/Exporter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,7 +205,6 @@ protected function syncConfigWithModules(): Collection

 $normalizedModuleKeyOrder = [
 'export_paths',
 'export_as',
 'dependencies',
 'dependencies_dev',
 'modules',
Expand Down

12 changes: 1 addition & 11 deletions
src/StarterKits/InstallableModule.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,18 +104,9 @@ protected function installDependencies(): self
 */
 protected function installableFiles(): Collection
 {
$installableFromExportPaths = $this
return $this
 ->exportPaths()
 ->flatMap(fn ($path) => $this->expandExportDirectoriesToFiles($path));

 $installableFromExportAsPaths = $this
 ->exportAsPaths()
 ->flip()
 ->flatMap(fn ($to, $from) => $this->expandExportDirectoriesToFiles($to, $from));

 return collect()
 ->merge($installableFromExportPaths)
 ->merge($installableFromExportAsPaths);
 }

 /**
Expand DownExpand Up@@ -196,7 +187,6 @@ protected function ensureInstallableFilesExist(): self
 {
 $this
 ->exportPaths()
 ->merge($this->exportAsPaths())
 ->reject(fn ($path) => $this->files->exists($this->installableFilesPath($path)))
 ->each(function ($path) {
 throw new StarterKitException("Starter kit path [{$path}] does not exist.");
Expand Down

13 changes: 0 additions & 13 deletions
src/StarterKits/Module.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,18 +62,6 @@ protected function exportPaths(): Collection
 return collect($this->config('export_paths') ?? []);
 }

 /**
 * Get `export_as` paths (to be renamed on install) as collection from config.
 *
 * This is only here for backwards compatibility. Use new `export` folder convention instead.
 *
 * @deprecated
 */
 protected function exportAsPaths(): Collection
 {
 return collect($this->config('export_as') ?? []);
 }

 /**
 * Ensure nested module config is not empty.
 *
Expand All@@ -82,7 +70,6 @@ protected function exportAsPaths(): Collection
 protected function ensureModuleConfigNotEmpty(): self
 {
 $hasConfig = $this->config()->has('export_paths')
 || $this->config()->has('export_as')
 || $this->config()->has('dependencies')
 || $this->config()->has('dependencies_dev')
 || $this->config()->has('modules');
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[6.x] Deprecations by duncanmcclean · Pull Request #11955 · statamic/cms · GitHub
Skip to content
[6.x] Deprecations#11955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 6 commits into

from

Jul 14, 2025
 Merged


[6.x] Deprecations
#11955
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
90a4d8c

Drop `filterSortAndPaginate` method on `ApiController`


duncanmcclean Jul 14, 2025
6a89fbc

Drop `export_as` option for starter kits.


duncanmcclean Jul 14, 2025
8234686

Drop `statamic` cache driver


duncanmcclean Jul 14, 2025
b15db77

Drop `addLocalization` method on `Entry`


duncanmcclean Jul 14, 2025
e7c3c3c

Fix starter kit tests


duncanmcclean Jul 14, 2025
1e64943

Remove other references to `export_as`


duncanmcclean Jul 14, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 0 additions & 8 deletions
src/Entries/Entry.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -821,14 +821,6 @@ public function existsIn($locale)
 return $this->in($locale) !== null;
 }

 /** @deprecated */
 public function addLocalization($entry)
 {
 $entry->origin($this);

 return $this;
 }

 public function makeLocalization($site)
 {
 $localization = Facades\Entry::make()
Expand Down

13 changes: 0 additions & 13 deletions
src/Http/Controllers/API/ApiController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,19 +77,6 @@ protected function filterAllowedResources($items)
 return $items->filter(fn ($item) => in_array($item->handle(), $allowedResources));
 }

 /**
 * Filter, sort, and paginate query for API resource output.
 *
 * @param \Statamic\Query\Builder $query
 * @return \Statamic\Extensions\Pagination\LengthAwarePaginator
 *
 * @deprecated
 */
 protected function filterSortAndPaginate($query)
 {
 return $this->updateAndPaginate($query);
 }

 /**
 * Filter, sort, scope, and paginate query for API resource output.
 *
Expand Down

9 changes: 0 additions & 9 deletions
src/Providers/CacheServiceProvider.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,15 +37,6 @@ public function boot()
 private function extendFileStore()
 {
 $this->app->booting(function () {
 /** @deprecated */
 Cache::extend('statamic', function () {
 return Cache::repository(new FileStore(
 $this->app['files'],
 $this->app['config']['cache.stores.file']['path'],
 $this->app['config']['cache.stores.file']['permission'] ?? null
 ), $this->app['config']['cache.stores.file']);
 });

 // Don't extend the file store if it's already being extended.
 $creators = (fn () => $this->customCreators)->call(Cache::getFacadeRoot());
 if (isset($creators['file'])) {
Expand Down

20 changes: 3 additions & 17 deletions
src/StarterKits/ExportableModule.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,14 +36,6 @@ public function export(string $starterKitPath): void
 from: $path,
 starterKitPath: $starterKitPath,
 ));

 $this
 ->exportAsPaths()
 ->each(fn ($to, $from) => $this->exportRelativePath(
 from: $from,
 to: $to,
 starterKitPath: $starterKitPath,
 ));
 }

 public function versionDependencies(): self
Expand DownExpand Up@@ -105,18 +97,13 @@ protected function exportDependenciesFromComposerRequire(string $requireKey, Col
 */
 protected function ensureNotExportingComposerJson(): self
 {
 // Here we'll ensure both `export_as` values and keys are included,
 // because we want to make sure `composer.json` is referenced on either end.
 $flattenedExportPaths = $this
 ->exportPaths()
 ->merge($this->exportAsPaths())
 ->merge($this->exportAsPaths()->keys());
 $paths = $this->exportPaths();

 if ($flattenedExportPaths->contains('starter-kit.yaml')) {
 if ($paths->contains('starter-kit.yaml')) {
 throw new StarterKitException('Cannot export [starter-kit.yaml] config.');
 }

 if ($flattenedExportPaths->contains('composer.json')) {
 if ($paths->contains('composer.json')) {
 throw new StarterKitException('Cannot export [composer.json]. Please use `dependencies` array.');
 }

Expand All@@ -132,7 +119,6 @@ protected function ensureExportablePathsExist(): self
 {
 $this
 ->exportPaths()
 ->merge($this->exportAsPaths()->keys())
 ->reject(fn ($path) => $this->files->exists(base_path($path)))
 ->each(function ($path) {
 throw new StarterKitException("Cannot export [{$path}], because it does not exist in your app.");
Expand Down

1 change: 0 additions & 1 deletion
src/StarterKits/Exporter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,7 +205,6 @@ protected function syncConfigWithModules(): Collection

 $normalizedModuleKeyOrder = [
 'export_paths',
 'export_as',
 'dependencies',
 'dependencies_dev',
 'modules',
Expand Down

12 changes: 1 addition & 11 deletions
src/StarterKits/InstallableModule.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,18 +104,9 @@ protected function installDependencies(): self
 */
 protected function installableFiles(): Collection
 {
$installableFromExportPaths = $this
return $this
 ->exportPaths()
 ->flatMap(fn ($path) => $this->expandExportDirectoriesToFiles($path));

 $installableFromExportAsPaths = $this
 ->exportAsPaths()
 ->flip()
 ->flatMap(fn ($to, $from) => $this->expandExportDirectoriesToFiles($to, $from));

 return collect()
 ->merge($installableFromExportPaths)
 ->merge($installableFromExportAsPaths);
 }

 /**
Expand DownExpand Up@@ -196,7 +187,6 @@ protected function ensureInstallableFilesExist(): self
 {
 $this
 ->exportPaths()
 ->merge($this->exportAsPaths())
 ->reject(fn ($path) => $this->files->exists($this->installableFilesPath($path)))
 ->each(function ($path) {
 throw new StarterKitException("Starter kit path [{$path}] does not exist.");
Expand Down

13 changes: 0 additions & 13 deletions
src/StarterKits/Module.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,18 +62,6 @@ protected function exportPaths(): Collection
 return collect($this->config('export_paths') ?? []);
 }

 /**
 * Get `export_as` paths (to be renamed on install) as collection from config.
 *
 * This is only here for backwards compatibility. Use new `export` folder convention instead.
 *
 * @deprecated
 */
 protected function exportAsPaths(): Collection
 {
 return collect($this->config('export_as') ?? []);
 }

 /**
 * Ensure nested module config is not empty.
 *
Expand All@@ -82,7 +70,6 @@ protected function exportAsPaths(): Collection
 protected function ensureModuleConfigNotEmpty(): self
 {
 $hasConfig = $this->config()->has('export_paths')
 || $this->config()->has('export_as')
 || $this->config()->has('dependencies')
 || $this->config()->has('dependencies_dev')
 || $this->config()->has('modules');
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
[6.x] Deprecations by duncanmcclean · Pull Request #11955 · statamic/cms · GitHub
Skip to content
[6.x] Deprecations#11955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 6 commits into

from

Jul 14, 2025
 Merged


[6.x] Deprecations
#11955
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
90a4d8c

Drop `filterSortAndPaginate` method on `ApiController`


duncanmcclean Jul 14, 2025
6a89fbc

Drop `export_as` option for starter kits.


duncanmcclean Jul 14, 2025
8234686

Drop `statamic` cache driver


duncanmcclean Jul 14, 2025
b15db77

Drop `addLocalization` method on `Entry`


duncanmcclean Jul 14, 2025
e7c3c3c

Fix starter kit tests


duncanmcclean Jul 14, 2025
1e64943

Remove other references to `export_as`


duncanmcclean Jul 14, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 0 additions & 8 deletions
src/Entries/Entry.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -821,14 +821,6 @@ public function existsIn($locale)
 return $this->in($locale) !== null;
 }

 /** @deprecated */
 public function addLocalization($entry)
 {
 $entry->origin($this);

 return $this;
 }

 public function makeLocalization($site)
 {
 $localization = Facades\Entry::make()
Expand Down

13 changes: 0 additions & 13 deletions
src/Http/Controllers/API/ApiController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,19 +77,6 @@ protected function filterAllowedResources($items)
 return $items->filter(fn ($item) => in_array($item->handle(), $allowedResources));
 }

 /**
 * Filter, sort, and paginate query for API resource output.
 *
 * @param \Statamic\Query\Builder $query
 * @return \Statamic\Extensions\Pagination\LengthAwarePaginator
 *
 * @deprecated
 */
 protected function filterSortAndPaginate($query)
 {
 return $this->updateAndPaginate($query);
 }

 /**
 * Filter, sort, scope, and paginate query for API resource output.
 *
Expand Down

9 changes: 0 additions & 9 deletions
src/Providers/CacheServiceProvider.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,15 +37,6 @@ public function boot()
 private function extendFileStore()
 {
 $this->app->booting(function () {
 /** @deprecated */
 Cache::extend('statamic', function () {
 return Cache::repository(new FileStore(
 $this->app['files'],
 $this->app['config']['cache.stores.file']['path'],
 $this->app['config']['cache.stores.file']['permission'] ?? null
 ), $this->app['config']['cache.stores.file']);
 });

 // Don't extend the file store if it's already being extended.
 $creators = (fn () => $this->customCreators)->call(Cache::getFacadeRoot());
 if (isset($creators['file'])) {
Expand Down

20 changes: 3 additions & 17 deletions
src/StarterKits/ExportableModule.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,14 +36,6 @@ public function export(string $starterKitPath): void
 from: $path,
 starterKitPath: $starterKitPath,
 ));

 $this
 ->exportAsPaths()
 ->each(fn ($to, $from) => $this->exportRelativePath(
 from: $from,
 to: $to,
 starterKitPath: $starterKitPath,
 ));
 }

 public function versionDependencies(): self
Expand DownExpand Up@@ -105,18 +97,13 @@ protected function exportDependenciesFromComposerRequire(string $requireKey, Col
 */
 protected function ensureNotExportingComposerJson(): self
 {
 // Here we'll ensure both `export_as` values and keys are included,
 // because we want to make sure `composer.json` is referenced on either end.
 $flattenedExportPaths = $this
 ->exportPaths()
 ->merge($this->exportAsPaths())
 ->merge($this->exportAsPaths()->keys());
 $paths = $this->exportPaths();

 if ($flattenedExportPaths->contains('starter-kit.yaml')) {
 if ($paths->contains('starter-kit.yaml')) {
 throw new StarterKitException('Cannot export [starter-kit.yaml] config.');
 }

 if ($flattenedExportPaths->contains('composer.json')) {
 if ($paths->contains('composer.json')) {
 throw new StarterKitException('Cannot export [composer.json]. Please use `dependencies` array.');
 }

Expand All@@ -132,7 +119,6 @@ protected function ensureExportablePathsExist(): self
 {
 $this
 ->exportPaths()
 ->merge($this->exportAsPaths()->keys())
 ->reject(fn ($path) => $this->files->exists(base_path($path)))
 ->each(function ($path) {
 throw new StarterKitException("Cannot export [{$path}], because it does not exist in your app.");
Expand Down

1 change: 0 additions & 1 deletion
src/StarterKits/Exporter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,7 +205,6 @@ protected function syncConfigWithModules(): Collection

 $normalizedModuleKeyOrder = [
 'export_paths',
 'export_as',
 'dependencies',
 'dependencies_dev',
 'modules',
Expand Down

12 changes: 1 addition & 11 deletions
src/StarterKits/InstallableModule.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,18 +104,9 @@ protected function installDependencies(): self
 */
 protected function installableFiles(): Collection
 {
$installableFromExportPaths = $this
return $this
 ->exportPaths()
 ->flatMap(fn ($path) => $this->expandExportDirectoriesToFiles($path));

 $installableFromExportAsPaths = $this
 ->exportAsPaths()
 ->flip()
 ->flatMap(fn ($to, $from) => $this->expandExportDirectoriesToFiles($to, $from));

 return collect()
 ->merge($installableFromExportPaths)
 ->merge($installableFromExportAsPaths);
 }

 /**
Expand DownExpand Up@@ -196,7 +187,6 @@ protected function ensureInstallableFilesExist(): self
 {
 $this
 ->exportPaths()
 ->merge($this->exportAsPaths())
 ->reject(fn ($path) => $this->files->exists($this->installableFilesPath($path)))
 ->each(function ($path) {
 throw new StarterKitException("Starter kit path [{$path}] does not exist.");
Expand Down

13 changes: 0 additions & 13 deletions
src/StarterKits/Module.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,18 +62,6 @@ protected function exportPaths(): Collection
 return collect($this->config('export_paths') ?? []);
 }

 /**
 * Get `export_as` paths (to be renamed on install) as collection from config.
 *
 * This is only here for backwards compatibility. Use new `export` folder convention instead.
 *
 * @deprecated
 */
 protected function exportAsPaths(): Collection
 {
 return collect($this->config('export_as') ?? []);
 }

 /**
 * Ensure nested module config is not empty.
 *
Expand All@@ -82,7 +70,6 @@ protected function exportAsPaths(): Collection
 protected function ensureModuleConfigNotEmpty(): self
 {
 $hasConfig = $this->config()->has('export_paths')
 || $this->config()->has('export_as')
 || $this->config()->has('dependencies')
 || $this->config()->has('dependencies_dev')
 || $this->config()->has('modules');
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[6.x] Deprecations by duncanmcclean · Pull Request #11955 · statamic/cms · GitHub
Skip to content
[6.x] Deprecations#11955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 6 commits into

from

Jul 14, 2025
 Merged


[6.x] Deprecations
#11955
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
90a4d8c

Drop `filterSortAndPaginate` method on `ApiController`


duncanmcclean Jul 14, 2025
6a89fbc

Drop `export_as` option for starter kits.


duncanmcclean Jul 14, 2025
8234686

Drop `statamic` cache driver


duncanmcclean Jul 14, 2025
b15db77

Drop `addLocalization` method on `Entry`


duncanmcclean Jul 14, 2025
e7c3c3c

Fix starter kit tests


duncanmcclean Jul 14, 2025
1e64943

Remove other references to `export_as`


duncanmcclean Jul 14, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 0 additions & 8 deletions
src/Entries/Entry.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -821,14 +821,6 @@ public function existsIn($locale)
 return $this->in($locale) !== null;
 }

 /** @deprecated */
 public function addLocalization($entry)
 {
 $entry->origin($this);

 return $this;
 }

 public function makeLocalization($site)
 {
 $localization = Facades\Entry::make()
Expand Down

13 changes: 0 additions & 13 deletions
src/Http/Controllers/API/ApiController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,19 +77,6 @@ protected function filterAllowedResources($items)
 return $items->filter(fn ($item) => in_array($item->handle(), $allowedResources));
 }

 /**
 * Filter, sort, and paginate query for API resource output.
 *
 * @param \Statamic\Query\Builder $query
 * @return \Statamic\Extensions\Pagination\LengthAwarePaginator
 *
 * @deprecated
 */
 protected function filterSortAndPaginate($query)
 {
 return $this->updateAndPaginate($query);
 }

 /**
 * Filter, sort, scope, and paginate query for API resource output.
 *
Expand Down

9 changes: 0 additions & 9 deletions
src/Providers/CacheServiceProvider.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,15 +37,6 @@ public function boot()
 private function extendFileStore()
 {
 $this->app->booting(function () {
 /** @deprecated */
 Cache::extend('statamic', function () {
 return Cache::repository(new FileStore(
 $this->app['files'],
 $this->app['config']['cache.stores.file']['path'],
 $this->app['config']['cache.stores.file']['permission'] ?? null
 ), $this->app['config']['cache.stores.file']);
 });

 // Don't extend the file store if it's already being extended.
 $creators = (fn () => $this->customCreators)->call(Cache::getFacadeRoot());
 if (isset($creators['file'])) {
Expand Down

20 changes: 3 additions & 17 deletions
src/StarterKits/ExportableModule.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,14 +36,6 @@ public function export(string $starterKitPath): void
 from: $path,
 starterKitPath: $starterKitPath,
 ));

 $this
 ->exportAsPaths()
 ->each(fn ($to, $from) => $this->exportRelativePath(
 from: $from,
 to: $to,
 starterKitPath: $starterKitPath,
 ));
 }

 public function versionDependencies(): self
Expand DownExpand Up@@ -105,18 +97,13 @@ protected function exportDependenciesFromComposerRequire(string $requireKey, Col
 */
 protected function ensureNotExportingComposerJson(): self
 {
 // Here we'll ensure both `export_as` values and keys are included,
 // because we want to make sure `composer.json` is referenced on either end.
 $flattenedExportPaths = $this
 ->exportPaths()
 ->merge($this->exportAsPaths())
 ->merge($this->exportAsPaths()->keys());
 $paths = $this->exportPaths();

 if ($flattenedExportPaths->contains('starter-kit.yaml')) {
 if ($paths->contains('starter-kit.yaml')) {
 throw new StarterKitException('Cannot export [starter-kit.yaml] config.');
 }

 if ($flattenedExportPaths->contains('composer.json')) {
 if ($paths->contains('composer.json')) {
 throw new StarterKitException('Cannot export [composer.json]. Please use `dependencies` array.');
 }

Expand All@@ -132,7 +119,6 @@ protected function ensureExportablePathsExist(): self
 {
 $this
 ->exportPaths()
 ->merge($this->exportAsPaths()->keys())
 ->reject(fn ($path) => $this->files->exists(base_path($path)))
 ->each(function ($path) {
 throw new StarterKitException("Cannot export [{$path}], because it does not exist in your app.");
Expand Down

1 change: 0 additions & 1 deletion
src/StarterKits/Exporter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,7 +205,6 @@ protected function syncConfigWithModules(): Collection

 $normalizedModuleKeyOrder = [
 'export_paths',
 'export_as',
 'dependencies',
 'dependencies_dev',
 'modules',
Expand Down

12 changes: 1 addition & 11 deletions
src/StarterKits/InstallableModule.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,18 +104,9 @@ protected function installDependencies(): self
 */
 protected function installableFiles(): Collection
 {
$installableFromExportPaths = $this
return $this
 ->exportPaths()
 ->flatMap(fn ($path) => $this->expandExportDirectoriesToFiles($path));

 $installableFromExportAsPaths = $this
 ->exportAsPaths()
 ->flip()
 ->flatMap(fn ($to, $from) => $this->expandExportDirectoriesToFiles($to, $from));

 return collect()
 ->merge($installableFromExportPaths)
 ->merge($installableFromExportAsPaths);
 }

 /**
Expand DownExpand Up@@ -196,7 +187,6 @@ protected function ensureInstallableFilesExist(): self
 {
 $this
 ->exportPaths()
 ->merge($this->exportAsPaths())
 ->reject(fn ($path) => $this->files->exists($this->installableFilesPath($path)))
 ->each(function ($path) {
 throw new StarterKitException("Starter kit path [{$path}] does not exist.");
Expand Down

13 changes: 0 additions & 13 deletions
src/StarterKits/Module.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,18 +62,6 @@ protected function exportPaths(): Collection
 return collect($this->config('export_paths') ?? []);
 }

 /**
 * Get `export_as` paths (to be renamed on install) as collection from config.
 *
 * This is only here for backwards compatibility. Use new `export` folder convention instead.
 *
 * @deprecated
 */
 protected function exportAsPaths(): Collection
 {
 return collect($this->config('export_as') ?? []);
 }

 /**
 * Ensure nested module config is not empty.
 *
Expand All@@ -82,7 +70,6 @@ protected function exportAsPaths(): Collection
 protected function ensureModuleConfigNotEmpty(): self
 {
 $hasConfig = $this->config()->has('export_paths')
 || $this->config()->has('export_as')
 || $this->config()->has('dependencies')
 || $this->config()->has('dependencies_dev')
 || $this->config()->has('modules');
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[6.x] Deprecations by duncanmcclean · Pull Request #11955 · statamic/cms · GitHub
Skip to content
[6.x] Deprecations#11955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 6 commits into

from

Jul 14, 2025
 Merged


[6.x] Deprecations
#11955
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
90a4d8c

Drop `filterSortAndPaginate` method on `ApiController`


duncanmcclean Jul 14, 2025
6a89fbc

Drop `export_as` option for starter kits.


duncanmcclean Jul 14, 2025
8234686

Drop `statamic` cache driver


duncanmcclean Jul 14, 2025
b15db77

Drop `addLocalization` method on `Entry`


duncanmcclean Jul 14, 2025
e7c3c3c

Fix starter kit tests


duncanmcclean Jul 14, 2025
1e64943

Remove other references to `export_as`


duncanmcclean Jul 14, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 0 additions & 8 deletions
src/Entries/Entry.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -821,14 +821,6 @@ public function existsIn($locale)
 return $this->in($locale) !== null;
 }

 /** @deprecated */
 public function addLocalization($entry)
 {
 $entry->origin($this);

 return $this;
 }

 public function makeLocalization($site)
 {
 $localization = Facades\Entry::make()
Expand Down

13 changes: 0 additions & 13 deletions
src/Http/Controllers/API/ApiController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,19 +77,6 @@ protected function filterAllowedResources($items)
 return $items->filter(fn ($item) => in_array($item->handle(), $allowedResources));
 }

 /**
 * Filter, sort, and paginate query for API resource output.
 *
 * @param \Statamic\Query\Builder $query
 * @return \Statamic\Extensions\Pagination\LengthAwarePaginator
 *
 * @deprecated
 */
 protected function filterSortAndPaginate($query)
 {
 return $this->updateAndPaginate($query);
 }

 /**
 * Filter, sort, scope, and paginate query for API resource output.
 *
Expand Down

9 changes: 0 additions & 9 deletions
src/Providers/CacheServiceProvider.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,15 +37,6 @@ public function boot()
 private function extendFileStore()
 {
 $this->app->booting(function () {
 /** @deprecated */
 Cache::extend('statamic', function () {
 return Cache::repository(new FileStore(
 $this->app['files'],
 $this->app['config']['cache.stores.file']['path'],
 $this->app['config']['cache.stores.file']['permission'] ?? null
 ), $this->app['config']['cache.stores.file']);
 });

 // Don't extend the file store if it's already being extended.
 $creators = (fn () => $this->customCreators)->call(Cache::getFacadeRoot());
 if (isset($creators['file'])) {
Expand Down

20 changes: 3 additions & 17 deletions
src/StarterKits/ExportableModule.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,14 +36,6 @@ public function export(string $starterKitPath): void
 from: $path,
 starterKitPath: $starterKitPath,
 ));

 $this
 ->exportAsPaths()
 ->each(fn ($to, $from) => $this->exportRelativePath(
 from: $from,
 to: $to,
 starterKitPath: $starterKitPath,
 ));
 }

 public function versionDependencies(): self
Expand DownExpand Up@@ -105,18 +97,13 @@ protected function exportDependenciesFromComposerRequire(string $requireKey, Col
 */
 protected function ensureNotExportingComposerJson(): self
 {
 // Here we'll ensure both `export_as` values and keys are included,
 // because we want to make sure `composer.json` is referenced on either end.
 $flattenedExportPaths = $this
 ->exportPaths()
 ->merge($this->exportAsPaths())
 ->merge($this->exportAsPaths()->keys());
 $paths = $this->exportPaths();

 if ($flattenedExportPaths->contains('starter-kit.yaml')) {
 if ($paths->contains('starter-kit.yaml')) {
 throw new StarterKitException('Cannot export [starter-kit.yaml] config.');
 }

 if ($flattenedExportPaths->contains('composer.json')) {
 if ($paths->contains('composer.json')) {
 throw new StarterKitException('Cannot export [composer.json]. Please use `dependencies` array.');
 }

Expand All@@ -132,7 +119,6 @@ protected function ensureExportablePathsExist(): self
 {
 $this
 ->exportPaths()
 ->merge($this->exportAsPaths()->keys())
 ->reject(fn ($path) => $this->files->exists(base_path($path)))
 ->each(function ($path) {
 throw new StarterKitException("Cannot export [{$path}], because it does not exist in your app.");
Expand Down

1 change: 0 additions & 1 deletion
src/StarterKits/Exporter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,7 +205,6 @@ protected function syncConfigWithModules(): Collection

 $normalizedModuleKeyOrder = [
 'export_paths',
 'export_as',
 'dependencies',
 'dependencies_dev',
 'modules',
Expand Down

12 changes: 1 addition & 11 deletions
src/StarterKits/InstallableModule.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,18 +104,9 @@ protected function installDependencies(): self
 */
 protected function installableFiles(): Collection
 {
$installableFromExportPaths = $this
return $this
 ->exportPaths()
 ->flatMap(fn ($path) => $this->expandExportDirectoriesToFiles($path));

 $installableFromExportAsPaths = $this
 ->exportAsPaths()
 ->flip()
 ->flatMap(fn ($to, $from) => $this->expandExportDirectoriesToFiles($to, $from));

 return collect()
 ->merge($installableFromExportPaths)
 ->merge($installableFromExportAsPaths);
 }

 /**
Expand DownExpand Up@@ -196,7 +187,6 @@ protected function ensureInstallableFilesExist(): self
 {
 $this
 ->exportPaths()
 ->merge($this->exportAsPaths())
 ->reject(fn ($path) => $this->files->exists($this->installableFilesPath($path)))
 ->each(function ($path) {
 throw new StarterKitException("Starter kit path [{$path}] does not exist.");
Expand Down

13 changes: 0 additions & 13 deletions
src/StarterKits/Module.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,18 +62,6 @@ protected function exportPaths(): Collection
 return collect($this->config('export_paths') ?? []);
 }

 /**
 * Get `export_as` paths (to be renamed on install) as collection from config.
 *
 * This is only here for backwards compatibility. Use new `export` folder convention instead.
 *
 * @deprecated
 */
 protected function exportAsPaths(): Collection
 {
 return collect($this->config('export_as') ?? []);
 }

 /**
 * Ensure nested module config is not empty.
 *
Expand All@@ -82,7 +70,6 @@ protected function exportAsPaths(): Collection
 protected function ensureModuleConfigNotEmpty(): self
 {
 $hasConfig = $this->config()->has('export_paths')
 || $this->config()->has('export_as')
 || $this->config()->has('dependencies')
 || $this->config()->has('dependencies_dev')
 || $this->config()->has('modules');
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
[6.x] Deprecations by duncanmcclean · Pull Request #11955 · statamic/cms · GitHub
Skip to content
[6.x] Deprecations#11955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 6 commits into

from

Jul 14, 2025
 Merged


[6.x] Deprecations
#11955
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
90a4d8c

Drop `filterSortAndPaginate` method on `ApiController`


duncanmcclean Jul 14, 2025
6a89fbc

Drop `export_as` option for starter kits.


duncanmcclean Jul 14, 2025
8234686

Drop `statamic` cache driver


duncanmcclean Jul 14, 2025
b15db77

Drop `addLocalization` method on `Entry`


duncanmcclean Jul 14, 2025
e7c3c3c

Fix starter kit tests


duncanmcclean Jul 14, 2025
1e64943

Remove other references to `export_as`


duncanmcclean Jul 14, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 0 additions & 8 deletions
src/Entries/Entry.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -821,14 +821,6 @@ public function existsIn($locale)
 return $this->in($locale) !== null;
 }

 /** @deprecated */
 public function addLocalization($entry)
 {
 $entry->origin($this);

 return $this;
 }

 public function makeLocalization($site)
 {
 $localization = Facades\Entry::make()
Expand Down

13 changes: 0 additions & 13 deletions
src/Http/Controllers/API/ApiController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,19 +77,6 @@ protected function filterAllowedResources($items)
 return $items->filter(fn ($item) => in_array($item->handle(), $allowedResources));
 }

 /**
 * Filter, sort, and paginate query for API resource output.
 *
 * @param \Statamic\Query\Builder $query
 * @return \Statamic\Extensions\Pagination\LengthAwarePaginator
 *
 * @deprecated
 */
 protected function filterSortAndPaginate($query)
 {
 return $this->updateAndPaginate($query);
 }

 /**
 * Filter, sort, scope, and paginate query for API resource output.
 *
Expand Down

9 changes: 0 additions & 9 deletions
src/Providers/CacheServiceProvider.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,15 +37,6 @@ public function boot()
 private function extendFileStore()
 {
 $this->app->booting(function () {
 /** @deprecated */
 Cache::extend('statamic', function () {
 return Cache::repository(new FileStore(
 $this->app['files'],
 $this->app['config']['cache.stores.file']['path'],
 $this->app['config']['cache.stores.file']['permission'] ?? null
 ), $this->app['config']['cache.stores.file']);
 });

 // Don't extend the file store if it's already being extended.
 $creators = (fn () => $this->customCreators)->call(Cache::getFacadeRoot());
 if (isset($creators['file'])) {
Expand Down

20 changes: 3 additions & 17 deletions
src/StarterKits/ExportableModule.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,14 +36,6 @@ public function export(string $starterKitPath): void
 from: $path,
 starterKitPath: $starterKitPath,
 ));

 $this
 ->exportAsPaths()
 ->each(fn ($to, $from) => $this->exportRelativePath(
 from: $from,
 to: $to,
 starterKitPath: $starterKitPath,
 ));
 }

 public function versionDependencies(): self
Expand DownExpand Up@@ -105,18 +97,13 @@ protected function exportDependenciesFromComposerRequire(string $requireKey, Col
 */
 protected function ensureNotExportingComposerJson(): self
 {
 // Here we'll ensure both `export_as` values and keys are included,
 // because we want to make sure `composer.json` is referenced on either end.
 $flattenedExportPaths = $this
 ->exportPaths()
 ->merge($this->exportAsPaths())
 ->merge($this->exportAsPaths()->keys());
 $paths = $this->exportPaths();

 if ($flattenedExportPaths->contains('starter-kit.yaml')) {
 if ($paths->contains('starter-kit.yaml')) {
 throw new StarterKitException('Cannot export [starter-kit.yaml] config.');
 }

 if ($flattenedExportPaths->contains('composer.json')) {
 if ($paths->contains('composer.json')) {
 throw new StarterKitException('Cannot export [composer.json]. Please use `dependencies` array.');
 }

Expand All@@ -132,7 +119,6 @@ protected function ensureExportablePathsExist(): self
 {
 $this
 ->exportPaths()
 ->merge($this->exportAsPaths()->keys())
 ->reject(fn ($path) => $this->files->exists(base_path($path)))
 ->each(function ($path) {
 throw new StarterKitException("Cannot export [{$path}], because it does not exist in your app.");
Expand Down

1 change: 0 additions & 1 deletion
src/StarterKits/Exporter.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,7 +205,6 @@ protected function syncConfigWithModules(): Collection

 $normalizedModuleKeyOrder = [
 'export_paths',
 'export_as',
 'dependencies',
 'dependencies_dev',
 'modules',
Expand Down

12 changes: 1 addition & 11 deletions
src/StarterKits/InstallableModule.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,18 +104,9 @@ protected function installDependencies(): self
 */
 protected function installableFiles(): Collection
 {
$installableFromExportPaths = $this
return $this
 ->exportPaths()
 ->flatMap(fn ($path) => $this->expandExportDirectoriesToFiles($path));

 $installableFromExportAsPaths = $this
 ->exportAsPaths()
 ->flip()
 ->flatMap(fn ($to, $from) => $this->expandExportDirectoriesToFiles($to, $from));

 return collect()
 ->merge($installableFromExportPaths)
 ->merge($installableFromExportAsPaths);
 }

 /**
Expand DownExpand Up@@ -196,7 +187,6 @@ protected function ensureInstallableFilesExist(): self
 {
 $this
 ->exportPaths()
 ->merge($this->exportAsPaths())
 ->reject(fn ($path) => $this->files->exists($this->installableFilesPath($path)))
 ->each(function ($path) {
 throw new StarterKitException("Starter kit path [{$path}] does not exist.");
Expand Down

13 changes: 0 additions & 13 deletions
src/StarterKits/Module.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,18 +62,6 @@ protected function exportPaths(): Collection
 return collect($this->config('export_paths') ?? []);
 }

 /**
 * Get `export_as` paths (to be renamed on install) as collection from config.
 *
 * This is only here for backwards compatibility. Use new `export` folder convention instead.
 *
 * @deprecated
 */
 protected function exportAsPaths(): Collection
 {
 return collect($this->config('export_as') ?? []);
 }

 /**
 * Ensure nested module config is not empty.
 *
Expand All@@ -82,7 +70,6 @@ protected function exportAsPaths(): Collection
 protected function ensureModuleConfigNotEmpty(): self
 {
 $hasConfig = $this->config()->has('export_paths')
 || $this->config()->has('export_as')
 || $this->config()->has('dependencies')
 || $this->config()->has('dependencies_dev')
 || $this->config()->has('modules');
Expand Down
Loading