[4.x] Remove deprecations

resources/js/components/Bard.js

@@ -8,11 +8,6 @@ class Bard {
  this.buttonCallbacks = [];
  }
 
- /** @deprecated */
- extend(callback) {
- this.addExtension(callback);
- }
-
  addExtension(callback) {
  this.extensionCallbacks.push(callback);
  }

src/Actions/DuplicateEntry.php

@@ -66,7 +66,7 @@ protected function getEntryParentFromStructure(Entry $entry)
  $parentEntry = $entry
  ->structure()
  ->in($entry->locale())
- ->page($entry->id())
+ ->find($entry->id())
  ->parent();
 
  if (! $parentEntry) {

src/Auth/Eloquent/User.php

@@ -20,14 +20,6 @@ class User extends BaseUser
  protected $roles;
  protected $groups;
 
- /** @deprecated */
- public static function fromModel(Model $model)
- {
- return tap(new static, function ($user) use ($model) {
- $user->model($model);
- });
- }
-
  public function model(Model $model = null)
  {
  if (is_null($model)) {

src/CP/Utilities/Utility.php

@@ -103,10 +103,4 @@ public function routes(Closure $routes = null)
  {
  return $this->fluentlyGetOrSet('routes')->args(func_get_args());
  }
-
- /** @deprecated */
- public function register()
- {
- \Statamic\Facades\Utility::push($this);
- }
 }

src/CP/Utilities/UtilityRepository.php

@@ -46,14 +46,6 @@ public function register($utility)
  return $utility;
  }
 
- /** @deprecated */
- public function push(Utility $utility)
- {
- $this->register($utility);
-
- return $this;
- }
-
  public function all()
  {
  return $this->utilities;

src/Config.php

@@ -2,7 +2,6 @@
 
 namespace Statamic;
 
-use Statamic\Facades\Image;
 use Statamic\Facades\Site;
 
 /**
@@ -152,17 +151,4 @@ public function getSiteUrl($locale = null)
  {
  return $this->getSite($locale)->url();
  }
-
- /**
- * Get the image manipulation presets.
- *
- * @return array
- *
- * @deprecated Use Statamic\Facades\Image::userManipulationPresets()
- * or Image::manipulationPresets() to get merged with CP presets.
- */
- public function getImageManipulationPresets()
- {
- return Image::userManipulationPresets();
- }
 }

src/Contracts/Entries/EntryRepository.php

@@ -14,9 +14,6 @@ public function find($id);
 
  public function findByUri(string $uri);
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection);
-
  public function make();
 
  public function query();

src/Contracts/Taxonomies/TermRepository.php

@@ -14,9 +14,6 @@ public function find($id);
 
  public function findByUri(string $uri);
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection);
-
  public function make(string $slug = null);
 
  public function query();

src/Entries/Entry.php

@@ -676,7 +676,7 @@ public function page()
  return null;
  }
 
- return $this->structure()->in($this->locale())->page($id);
+ return $this->structure()->in($this->locale())->find($id);
  }
 
  public function route()

src/Events/FormSubmitted.php

@@ -8,13 +8,9 @@ class FormSubmitted extends Event
 {
  public $submission;
 
- /** @deprecated */
- public $form;
-
  public function __construct(Submission $submission)
  {
  $this->submission = $submission;
- $this->form = $submission; // deprecated
  }
 
  /**

src/Facades/Config.php

@@ -18,7 +18,6 @@
  * @method static mixed getDefaultLocale()
  * @method static array getOtherLocales($locale = null)
  * @method static mixed getSiteUrl($locale = null)
- * @method static array getImageManipulationPresets()
  *
  * @see \Statamic\Config
  */

src/Fields/Field.php

@@ -199,14 +199,6 @@ public function isVisibleOnListing()
  return ! in_array($this->get('listable'), [false, 'hidden'], true);
  }
 
- /**
- * @deprecated Use isVisibleOnListing() instead.
- */
- public function isVisible()
- {
- return $this->isVisibleOnListing();
- }
-
  public function isSortable()
  {
  if (is_null($this->get('sortable'))) {
@@ -249,20 +241,6 @@ public function toPublishArray()
  ]);
  }
 
- /**
- * @deprecated
- */
- public function toBlueprintArray()
- {
- return [
- 'handle' => $this->handle,
- 'type' => $this->type(),
- 'display' => $this->display(),
- 'instructions' => $this->instructions(),
- 'config' => array_except($this->preProcessedConfig(), 'type'),
- ];
- }
-
  public function setValue($value)
  {
  $this->value = $value;

src/Http/Controllers/CP/Collections/CollectionTreeController.php

@@ -68,7 +68,7 @@ private function validateUniqueUris($tree)
  }
 
  foreach ($tree->diff()->moved() as $id) {
- $page = $tree->page($id);
+ $page = $tree->find($id);
  $parent = $page->parent();
 
  $siblings = (! $parent || $parent->isRoot())

src/Http/Controllers/CP/Collections/EntriesController.php

@@ -225,7 +225,7 @@ public function update(Request $request, $collection, $entry)
  $this->validateParent($entry, $tree, $parent);
 
  $entry->afterSave(function ($entry) use ($parent, $tree) {
- if ($parent && optional($tree->page($parent))->isRoot()) {
+ if ($parent && optional($tree->find($parent))->isRoot()) {
  $parent = null;
  }
 
@@ -379,7 +379,7 @@ public function store(Request $request, $collection, $site)
  if ($structure && ! $collection->orderable()) {
  $parent = $values['parent'] ?? null;
  $entry->afterSave(function ($entry) use ($parent, $tree) {
- if ($parent && optional($tree->page($parent))->isRoot()) {
+ if ($parent && optional($tree->find($parent))->isRoot()) {
  $parent = null;
  }
 
@@ -537,7 +537,7 @@ private function entryUri($entry, $tree, $parent)
  return $entry->uri();
  }
 
- $parent = $parent ? $tree->page($parent) : null;
+ $parent = $parent ? $tree->find($parent) : null;
 
  return app(\Statamic\Contracts\Routing\UrlBuilder::class)
  ->content($entry)

src/Imaging/Manager.php

@@ -86,14 +86,6 @@ public function cpManipulationPresets()
  ];
  }
 
- /**
- * @deprecated
- */
- public function getCpImageManipulationPresets()
- {
- return $this->cpManipulationPresets();
- }
-
  /**
  * Normalize preset.
  *

src/Modifiers/CoreModifiers.php

@@ -756,20 +756,6 @@ public function formatTranslated($value, $params)
  return $this->carbon($value)->translatedFormat(Arr::get($params, 0));
  }
 
- /**
- * Converts a string to a Carbon instance and formats it according to the whim of the Overlord.
- *
- * @deprecated formatLocalized is deprecated since Carbon 2.55.0. You may want to use isoFormat instead.
- *
- * @param $value
- * @param $params
- * @return string
- */
- public function formatLocalized($value, $params)
- {
- return $this->carbon($value)->formatLocalized(Arr::get($params, 0));
- }
-
  /**
  * Format a number with grouped thousands and decimal points.
  *

src/Providers/ExtensionServiceProvider.php

@@ -119,7 +119,6 @@ class ExtensionServiceProvider extends ServiceProvider
  'piped' => 'optionList',
  'json' => 'toJson',
  'email' => 'obfuscateEmail',
- 'l10n' => 'formatLocalized',
  'lowercase' => 'lower',
  'tz' => 'timezone',
  'inFuture' => 'isFuture',

src/Stache/Repositories/EntryRepository.php

@@ -43,15 +43,6 @@ public function find($id): ?Entry
  return $this->query()->where('id', $id)->first();
  }
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection): ?Entry
- {
- return $this->query()
- ->where('slug', $slug)
- ->where('collection', $collection)
- ->first();
- }
-
  public function findByUri(string $uri, string $site = null): ?Entry
  {
  $site = $site ?? $this->stache->sites()->first();
@@ -74,7 +65,7 @@ public function findByUri(string $uri, string $site = null): ?Entry
  }
 
  return $entry->hasStructure()
- ? $entry->structure()->in($site)->page($entry->id())
+ ? $entry->structure()->in($site)->find($entry->id())
  : $entry;
  }
 

src/Stache/Repositories/TermRepository.php

@@ -91,15 +91,6 @@ public function findByUri(string $uri, string $site = null): ?Term
  return $term->collection($collection);
  }
 
- /** @deprecated */
- public function findBySlug(string $slug, string $taxonomy): ?Term
- {
- return $this->query()
- ->where('slug', $slug)
- ->where('taxonomy', $taxonomy)
- ->first();
- }
-
  public function save($term)
  {
  $this->store

src/StaticCaching/Cachers/AbstractCacher.php

@@ -68,8 +68,7 @@ public function getBaseUrl()
  */
  public function getDefaultExpiration()
  {
- return $this->config('expiry')
- ?? $this->config('default_cache_length'); // deprecated
+ return $this->config('expiry');
  }
 
  /**

src/Structures/Tree.php

@@ -140,14 +140,6 @@ public function uriCacheEnabled()
  return $this->uriCacheEnabled;
  }
 
- /**
- * @deprecated Use find() instead.
- */
- public function page($id): ?Page
- {
- return $this->find($id);
- }
-
  public function find($id): ?Page
  {
  return $this->flattenedPages()
@@ -245,7 +237,7 @@ public function append($entry)
 
  public function appendTo($parent, $page)
  {
- if ($parent && ! $this->page($parent)) {
+ if ($parent && ! $this->find($parent)) {
  throw new \Exception("Page [{$parent}] does not exist in this structure");
  }
 
@@ -287,7 +279,7 @@ private function appendToInBranches($parent, $page, $branches)
 
  public function move($entry, $target)
  {
- $parent = optional($this->page($entry)->parent());
+ $parent = optional($this->find($entry)->parent());
 
  if ($parent->id() === $target || $parent->isRoot() && is_null($target)) {
  return $this;

src/Structures/TreeBuilder.php

@@ -34,7 +34,7 @@ public function build($params)
  $entry = ($from && $from !== '/') ? Entry::findByUri(Str::start($from, '/'), $params['site']) : null;
 
  if ($entry) {
- $page = $tree->page($entry->id());
+ $page = $tree->find($entry->id());
  $pages = $page->pages()->all();
  } else {
  $pages = $tree->pages()

resources/js/components/Bard.js

@@ -8,11 +8,6 @@ class Bard {
  this.buttonCallbacks = [];
  }
 
- /** @deprecated */
- extend(callback) {
- this.addExtension(callback);
- }
-
  addExtension(callback) {
  this.extensionCallbacks.push(callback);
  }

src/Actions/DuplicateEntry.php

@@ -66,7 +66,7 @@ protected function getEntryParentFromStructure(Entry $entry)
  $parentEntry = $entry
  ->structure()
  ->in($entry->locale())
- ->page($entry->id())
+ ->find($entry->id())
  ->parent();
 
  if (! $parentEntry) {

src/Auth/Eloquent/User.php

@@ -20,14 +20,6 @@ class User extends BaseUser
  protected $roles;
  protected $groups;
 
- /** @deprecated */
- public static function fromModel(Model $model)
- {
- return tap(new static, function ($user) use ($model) {
- $user->model($model);
- });
- }
-
  public function model(Model $model = null)
  {
  if (is_null($model)) {

src/CP/Utilities/Utility.php

@@ -103,10 +103,4 @@ public function routes(Closure $routes = null)
  {
  return $this->fluentlyGetOrSet('routes')->args(func_get_args());
  }
-
- /** @deprecated */
- public function register()
- {
- \Statamic\Facades\Utility::push($this);
- }
 }

src/CP/Utilities/UtilityRepository.php

@@ -46,14 +46,6 @@ public function register($utility)
  return $utility;
  }
 
- /** @deprecated */
- public function push(Utility $utility)
- {
- $this->register($utility);
-
- return $this;
- }
-
  public function all()
  {
  return $this->utilities;

src/Config.php

@@ -2,7 +2,6 @@
 
 namespace Statamic;
 
-use Statamic\Facades\Image;
 use Statamic\Facades\Site;
 
 /**
@@ -152,17 +151,4 @@ public function getSiteUrl($locale = null)
  {
  return $this->getSite($locale)->url();
  }
-
- /**
- * Get the image manipulation presets.
- *
- * @return array
- *
- * @deprecated Use Statamic\Facades\Image::userManipulationPresets()
- * or Image::manipulationPresets() to get merged with CP presets.
- */
- public function getImageManipulationPresets()
- {
- return Image::userManipulationPresets();
- }
 }

src/Contracts/Entries/EntryRepository.php

@@ -14,9 +14,6 @@ public function find($id);
 
  public function findByUri(string $uri);
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection);
-
  public function make();
 
  public function query();

src/Contracts/Taxonomies/TermRepository.php

@@ -14,9 +14,6 @@ public function find($id);
 
  public function findByUri(string $uri);
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection);
-
  public function make(string $slug = null);
 
  public function query();

src/Entries/Entry.php

@@ -676,7 +676,7 @@ public function page()
  return null;
  }
 
- return $this->structure()->in($this->locale())->page($id);
+ return $this->structure()->in($this->locale())->find($id);
  }
 
  public function route()

src/Events/FormSubmitted.php

@@ -8,13 +8,9 @@ class FormSubmitted extends Event
 {
  public $submission;
 
- /** @deprecated */
- public $form;
-
  public function __construct(Submission $submission)
  {
  $this->submission = $submission;
- $this->form = $submission; // deprecated
  }
 
  /**

src/Facades/Config.php

@@ -18,7 +18,6 @@
  * @method static mixed getDefaultLocale()
  * @method static array getOtherLocales($locale = null)
  * @method static mixed getSiteUrl($locale = null)
- * @method static array getImageManipulationPresets()
  *
  * @see \Statamic\Config
  */

src/Fields/Field.php

@@ -199,14 +199,6 @@ public function isVisibleOnListing()
  return ! in_array($this->get('listable'), [false, 'hidden'], true);
  }
 
- /**
- * @deprecated Use isVisibleOnListing() instead.
- */
- public function isVisible()
- {
- return $this->isVisibleOnListing();
- }
-
  public function isSortable()
  {
  if (is_null($this->get('sortable'))) {
@@ -249,20 +241,6 @@ public function toPublishArray()
  ]);
  }
 
- /**
- * @deprecated
- */
- public function toBlueprintArray()
- {
- return [
- 'handle' => $this->handle,
- 'type' => $this->type(),
- 'display' => $this->display(),
- 'instructions' => $this->instructions(),
- 'config' => array_except($this->preProcessedConfig(), 'type'),
- ];
- }
-
  public function setValue($value)
  {
  $this->value = $value;

src/Http/Controllers/CP/Collections/CollectionTreeController.php

@@ -68,7 +68,7 @@ private function validateUniqueUris($tree)
  }
 
  foreach ($tree->diff()->moved() as $id) {
- $page = $tree->page($id);
+ $page = $tree->find($id);
  $parent = $page->parent();
 
  $siblings = (! $parent || $parent->isRoot())

src/Http/Controllers/CP/Collections/EntriesController.php

@@ -225,7 +225,7 @@ public function update(Request $request, $collection, $entry)
  $this->validateParent($entry, $tree, $parent);
 
  $entry->afterSave(function ($entry) use ($parent, $tree) {
- if ($parent && optional($tree->page($parent))->isRoot()) {
+ if ($parent && optional($tree->find($parent))->isRoot()) {
  $parent = null;
  }
 
@@ -379,7 +379,7 @@ public function store(Request $request, $collection, $site)
  if ($structure && ! $collection->orderable()) {
  $parent = $values['parent'] ?? null;
  $entry->afterSave(function ($entry) use ($parent, $tree) {
- if ($parent && optional($tree->page($parent))->isRoot()) {
+ if ($parent && optional($tree->find($parent))->isRoot()) {
  $parent = null;
  }
 
@@ -537,7 +537,7 @@ private function entryUri($entry, $tree, $parent)
  return $entry->uri();
  }
 
- $parent = $parent ? $tree->page($parent) : null;
+ $parent = $parent ? $tree->find($parent) : null;
 
  return app(\Statamic\Contracts\Routing\UrlBuilder::class)
  ->content($entry)

src/Imaging/Manager.php

@@ -86,14 +86,6 @@ public function cpManipulationPresets()
  ];
  }
 
- /**
- * @deprecated
- */
- public function getCpImageManipulationPresets()
- {
- return $this->cpManipulationPresets();
- }
-
  /**
  * Normalize preset.
  *

src/Modifiers/CoreModifiers.php

@@ -756,20 +756,6 @@ public function formatTranslated($value, $params)
  return $this->carbon($value)->translatedFormat(Arr::get($params, 0));
  }
 
- /**
- * Converts a string to a Carbon instance and formats it according to the whim of the Overlord.
- *
- * @deprecated formatLocalized is deprecated since Carbon 2.55.0. You may want to use isoFormat instead.
- *
- * @param $value
- * @param $params
- * @return string
- */
- public function formatLocalized($value, $params)
- {
- return $this->carbon($value)->formatLocalized(Arr::get($params, 0));
- }
-
  /**
  * Format a number with grouped thousands and decimal points.
  *

src/Providers/ExtensionServiceProvider.php

@@ -119,7 +119,6 @@ class ExtensionServiceProvider extends ServiceProvider
  'piped' => 'optionList',
  'json' => 'toJson',
  'email' => 'obfuscateEmail',
- 'l10n' => 'formatLocalized',
  'lowercase' => 'lower',
  'tz' => 'timezone',
  'inFuture' => 'isFuture',

src/Stache/Repositories/EntryRepository.php

@@ -43,15 +43,6 @@ public function find($id): ?Entry
  return $this->query()->where('id', $id)->first();
  }
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection): ?Entry
- {
- return $this->query()
- ->where('slug', $slug)
- ->where('collection', $collection)
- ->first();
- }
-
  public function findByUri(string $uri, string $site = null): ?Entry
  {
  $site = $site ?? $this->stache->sites()->first();
@@ -74,7 +65,7 @@ public function findByUri(string $uri, string $site = null): ?Entry
  }
 
  return $entry->hasStructure()
- ? $entry->structure()->in($site)->page($entry->id())
+ ? $entry->structure()->in($site)->find($entry->id())
  : $entry;
  }
 

src/Stache/Repositories/TermRepository.php

@@ -91,15 +91,6 @@ public function findByUri(string $uri, string $site = null): ?Term
  return $term->collection($collection);
  }
 
- /** @deprecated */
- public function findBySlug(string $slug, string $taxonomy): ?Term
- {
- return $this->query()
- ->where('slug', $slug)
- ->where('taxonomy', $taxonomy)
- ->first();
- }
-
  public function save($term)
  {
  $this->store

src/StaticCaching/Cachers/AbstractCacher.php

@@ -68,8 +68,7 @@ public function getBaseUrl()
  */
  public function getDefaultExpiration()
  {
- return $this->config('expiry')
- ?? $this->config('default_cache_length'); // deprecated
+ return $this->config('expiry');
  }
 
  /**

src/Structures/Tree.php

@@ -140,14 +140,6 @@ public function uriCacheEnabled()
  return $this->uriCacheEnabled;
  }
 
- /**
- * @deprecated Use find() instead.
- */
- public function page($id): ?Page
- {
- return $this->find($id);
- }
-
  public function find($id): ?Page
  {
  return $this->flattenedPages()
@@ -245,7 +237,7 @@ public function append($entry)
 
  public function appendTo($parent, $page)
  {
- if ($parent && ! $this->page($parent)) {
+ if ($parent && ! $this->find($parent)) {
  throw new \Exception("Page [{$parent}] does not exist in this structure");
  }
 
@@ -287,7 +279,7 @@ private function appendToInBranches($parent, $page, $branches)
 
  public function move($entry, $target)
  {
- $parent = optional($this->page($entry)->parent());
+ $parent = optional($this->find($entry)->parent());
 
  if ($parent->id() === $target || $parent->isRoot() && is_null($target)) {
  return $this;

src/Structures/TreeBuilder.php

@@ -34,7 +34,7 @@ public function build($params)
  $entry = ($from && $from !== '/') ? Entry::findByUri(Str::start($from, '/'), $params['site']) : null;
 
  if ($entry) {
- $page = $tree->page($entry->id());
+ $page = $tree->find($entry->id());
  $pages = $page->pages()->all();
  } else {
  $pages = $tree->pages()

resources/js/components/Bard.js

@@ -8,11 +8,6 @@ class Bard {
  this.buttonCallbacks = [];
  }
 
- /** @deprecated */
- extend(callback) {
- this.addExtension(callback);
- }
-
  addExtension(callback) {
  this.extensionCallbacks.push(callback);
  }

src/Actions/DuplicateEntry.php

@@ -66,7 +66,7 @@ protected function getEntryParentFromStructure(Entry $entry)
  $parentEntry = $entry
  ->structure()
  ->in($entry->locale())
- ->page($entry->id())
+ ->find($entry->id())
  ->parent();
 
  if (! $parentEntry) {

src/Auth/Eloquent/User.php

@@ -20,14 +20,6 @@ class User extends BaseUser
  protected $roles;
  protected $groups;
 
- /** @deprecated */
- public static function fromModel(Model $model)
- {
- return tap(new static, function ($user) use ($model) {
- $user->model($model);
- });
- }
-
  public function model(Model $model = null)
  {
  if (is_null($model)) {

src/CP/Utilities/Utility.php

@@ -103,10 +103,4 @@ public function routes(Closure $routes = null)
  {
  return $this->fluentlyGetOrSet('routes')->args(func_get_args());
  }
-
- /** @deprecated */
- public function register()
- {
- \Statamic\Facades\Utility::push($this);
- }
 }

src/CP/Utilities/UtilityRepository.php

@@ -46,14 +46,6 @@ public function register($utility)
  return $utility;
  }
 
- /** @deprecated */
- public function push(Utility $utility)
- {
- $this->register($utility);
-
- return $this;
- }
-
  public function all()
  {
  return $this->utilities;

src/Config.php

@@ -2,7 +2,6 @@
 
 namespace Statamic;
 
-use Statamic\Facades\Image;
 use Statamic\Facades\Site;
 
 /**
@@ -152,17 +151,4 @@ public function getSiteUrl($locale = null)
  {
  return $this->getSite($locale)->url();
  }
-
- /**
- * Get the image manipulation presets.
- *
- * @return array
- *
- * @deprecated Use Statamic\Facades\Image::userManipulationPresets()
- * or Image::manipulationPresets() to get merged with CP presets.
- */
- public function getImageManipulationPresets()
- {
- return Image::userManipulationPresets();
- }
 }

src/Contracts/Entries/EntryRepository.php

@@ -14,9 +14,6 @@ public function find($id);
 
  public function findByUri(string $uri);
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection);
-
  public function make();
 
  public function query();

src/Contracts/Taxonomies/TermRepository.php

@@ -14,9 +14,6 @@ public function find($id);
 
  public function findByUri(string $uri);
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection);
-
  public function make(string $slug = null);
 
  public function query();

src/Entries/Entry.php

@@ -676,7 +676,7 @@ public function page()
  return null;
  }
 
- return $this->structure()->in($this->locale())->page($id);
+ return $this->structure()->in($this->locale())->find($id);
  }
 
  public function route()

src/Events/FormSubmitted.php

@@ -8,13 +8,9 @@ class FormSubmitted extends Event
 {
  public $submission;
 
- /** @deprecated */
- public $form;
-
  public function __construct(Submission $submission)
  {
  $this->submission = $submission;
- $this->form = $submission; // deprecated
  }
 
  /**

src/Facades/Config.php

@@ -18,7 +18,6 @@
  * @method static mixed getDefaultLocale()
  * @method static array getOtherLocales($locale = null)
  * @method static mixed getSiteUrl($locale = null)
- * @method static array getImageManipulationPresets()
  *
  * @see \Statamic\Config
  */

src/Fields/Field.php

@@ -199,14 +199,6 @@ public function isVisibleOnListing()
  return ! in_array($this->get('listable'), [false, 'hidden'], true);
  }
 
- /**
- * @deprecated Use isVisibleOnListing() instead.
- */
- public function isVisible()
- {
- return $this->isVisibleOnListing();
- }
-
  public function isSortable()
  {
  if (is_null($this->get('sortable'))) {
@@ -249,20 +241,6 @@ public function toPublishArray()
  ]);
  }
 
- /**
- * @deprecated
- */
- public function toBlueprintArray()
- {
- return [
- 'handle' => $this->handle,
- 'type' => $this->type(),
- 'display' => $this->display(),
- 'instructions' => $this->instructions(),
- 'config' => array_except($this->preProcessedConfig(), 'type'),
- ];
- }
-
  public function setValue($value)
  {
  $this->value = $value;

src/Http/Controllers/CP/Collections/CollectionTreeController.php

@@ -68,7 +68,7 @@ private function validateUniqueUris($tree)
  }
 
  foreach ($tree->diff()->moved() as $id) {
- $page = $tree->page($id);
+ $page = $tree->find($id);
  $parent = $page->parent();
 
  $siblings = (! $parent || $parent->isRoot())

src/Http/Controllers/CP/Collections/EntriesController.php

@@ -225,7 +225,7 @@ public function update(Request $request, $collection, $entry)
  $this->validateParent($entry, $tree, $parent);
 
  $entry->afterSave(function ($entry) use ($parent, $tree) {
- if ($parent && optional($tree->page($parent))->isRoot()) {
+ if ($parent && optional($tree->find($parent))->isRoot()) {
  $parent = null;
  }
 
@@ -379,7 +379,7 @@ public function store(Request $request, $collection, $site)
  if ($structure && ! $collection->orderable()) {
  $parent = $values['parent'] ?? null;
  $entry->afterSave(function ($entry) use ($parent, $tree) {
- if ($parent && optional($tree->page($parent))->isRoot()) {
+ if ($parent && optional($tree->find($parent))->isRoot()) {
  $parent = null;
  }
 
@@ -537,7 +537,7 @@ private function entryUri($entry, $tree, $parent)
  return $entry->uri();
  }
 
- $parent = $parent ? $tree->page($parent) : null;
+ $parent = $parent ? $tree->find($parent) : null;
 
  return app(\Statamic\Contracts\Routing\UrlBuilder::class)
  ->content($entry)

src/Imaging/Manager.php

@@ -86,14 +86,6 @@ public function cpManipulationPresets()
  ];
  }
 
- /**
- * @deprecated
- */
- public function getCpImageManipulationPresets()
- {
- return $this->cpManipulationPresets();
- }
-
  /**
  * Normalize preset.
  *

src/Modifiers/CoreModifiers.php

@@ -756,20 +756,6 @@ public function formatTranslated($value, $params)
  return $this->carbon($value)->translatedFormat(Arr::get($params, 0));
  }
 
- /**
- * Converts a string to a Carbon instance and formats it according to the whim of the Overlord.
- *
- * @deprecated formatLocalized is deprecated since Carbon 2.55.0. You may want to use isoFormat instead.
- *
- * @param $value
- * @param $params
- * @return string
- */
- public function formatLocalized($value, $params)
- {
- return $this->carbon($value)->formatLocalized(Arr::get($params, 0));
- }
-
  /**
  * Format a number with grouped thousands and decimal points.
  *

src/Providers/ExtensionServiceProvider.php

@@ -119,7 +119,6 @@ class ExtensionServiceProvider extends ServiceProvider
  'piped' => 'optionList',
  'json' => 'toJson',
  'email' => 'obfuscateEmail',
- 'l10n' => 'formatLocalized',
  'lowercase' => 'lower',
  'tz' => 'timezone',
  'inFuture' => 'isFuture',

src/Stache/Repositories/EntryRepository.php

@@ -43,15 +43,6 @@ public function find($id): ?Entry
  return $this->query()->where('id', $id)->first();
  }
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection): ?Entry
- {
- return $this->query()
- ->where('slug', $slug)
- ->where('collection', $collection)
- ->first();
- }
-
  public function findByUri(string $uri, string $site = null): ?Entry
  {
  $site = $site ?? $this->stache->sites()->first();
@@ -74,7 +65,7 @@ public function findByUri(string $uri, string $site = null): ?Entry
  }
 
  return $entry->hasStructure()
- ? $entry->structure()->in($site)->page($entry->id())
+ ? $entry->structure()->in($site)->find($entry->id())
  : $entry;
  }
 

src/Stache/Repositories/TermRepository.php

@@ -91,15 +91,6 @@ public function findByUri(string $uri, string $site = null): ?Term
  return $term->collection($collection);
  }
 
- /** @deprecated */
- public function findBySlug(string $slug, string $taxonomy): ?Term
- {
- return $this->query()
- ->where('slug', $slug)
- ->where('taxonomy', $taxonomy)
- ->first();
- }
-
  public function save($term)
  {
  $this->store

src/StaticCaching/Cachers/AbstractCacher.php

@@ -68,8 +68,7 @@ public function getBaseUrl()
  */
  public function getDefaultExpiration()
  {
- return $this->config('expiry')
- ?? $this->config('default_cache_length'); // deprecated
+ return $this->config('expiry');
  }
 
  /**

src/Structures/Tree.php

@@ -140,14 +140,6 @@ public function uriCacheEnabled()
  return $this->uriCacheEnabled;
  }
 
- /**
- * @deprecated Use find() instead.
- */
- public function page($id): ?Page
- {
- return $this->find($id);
- }
-
  public function find($id): ?Page
  {
  return $this->flattenedPages()
@@ -245,7 +237,7 @@ public function append($entry)
 
  public function appendTo($parent, $page)
  {
- if ($parent && ! $this->page($parent)) {
+ if ($parent && ! $this->find($parent)) {
  throw new \Exception("Page [{$parent}] does not exist in this structure");
  }
 
@@ -287,7 +279,7 @@ private function appendToInBranches($parent, $page, $branches)
 
  public function move($entry, $target)
  {
- $parent = optional($this->page($entry)->parent());
+ $parent = optional($this->find($entry)->parent());
 
  if ($parent->id() === $target || $parent->isRoot() && is_null($target)) {
  return $this;

src/Structures/TreeBuilder.php

@@ -34,7 +34,7 @@ public function build($params)
  $entry = ($from && $from !== '/') ? Entry::findByUri(Str::start($from, '/'), $params['site']) : null;
 
  if ($entry) {
- $page = $tree->page($entry->id());
+ $page = $tree->find($entry->id());
  $pages = $page->pages()->all();
  } else {
  $pages = $tree->pages()

resources/js/components/Bard.js

@@ -8,11 +8,6 @@ class Bard {
  this.buttonCallbacks = [];
  }
 
- /** @deprecated */
- extend(callback) {
- this.addExtension(callback);
- }
-
  addExtension(callback) {
  this.extensionCallbacks.push(callback);
  }

src/Actions/DuplicateEntry.php

@@ -66,7 +66,7 @@ protected function getEntryParentFromStructure(Entry $entry)
  $parentEntry = $entry
  ->structure()
  ->in($entry->locale())
- ->page($entry->id())
+ ->find($entry->id())
  ->parent();
 
  if (! $parentEntry) {

src/Auth/Eloquent/User.php

@@ -20,14 +20,6 @@ class User extends BaseUser
  protected $roles;
  protected $groups;
 
- /** @deprecated */
- public static function fromModel(Model $model)
- {
- return tap(new static, function ($user) use ($model) {
- $user->model($model);
- });
- }
-
  public function model(Model $model = null)
  {
  if (is_null($model)) {

src/CP/Utilities/Utility.php

@@ -103,10 +103,4 @@ public function routes(Closure $routes = null)
  {
  return $this->fluentlyGetOrSet('routes')->args(func_get_args());
  }
-
- /** @deprecated */
- public function register()
- {
- \Statamic\Facades\Utility::push($this);
- }
 }

src/CP/Utilities/UtilityRepository.php

@@ -46,14 +46,6 @@ public function register($utility)
  return $utility;
  }
 
- /** @deprecated */
- public function push(Utility $utility)
- {
- $this->register($utility);
-
- return $this;
- }
-
  public function all()
  {
  return $this->utilities;

src/Config.php

@@ -2,7 +2,6 @@
 
 namespace Statamic;
 
-use Statamic\Facades\Image;
 use Statamic\Facades\Site;
 
 /**
@@ -152,17 +151,4 @@ public function getSiteUrl($locale = null)
  {
  return $this->getSite($locale)->url();
  }
-
- /**
- * Get the image manipulation presets.
- *
- * @return array
- *
- * @deprecated Use Statamic\Facades\Image::userManipulationPresets()
- * or Image::manipulationPresets() to get merged with CP presets.
- */
- public function getImageManipulationPresets()
- {
- return Image::userManipulationPresets();
- }
 }

src/Contracts/Entries/EntryRepository.php

@@ -14,9 +14,6 @@ public function find($id);
 
  public function findByUri(string $uri);
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection);
-
  public function make();
 
  public function query();

src/Contracts/Taxonomies/TermRepository.php

@@ -14,9 +14,6 @@ public function find($id);
 
  public function findByUri(string $uri);
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection);
-
  public function make(string $slug = null);
 
  public function query();

src/Entries/Entry.php

@@ -676,7 +676,7 @@ public function page()
  return null;
  }
 
- return $this->structure()->in($this->locale())->page($id);
+ return $this->structure()->in($this->locale())->find($id);
  }
 
  public function route()

src/Events/FormSubmitted.php

@@ -8,13 +8,9 @@ class FormSubmitted extends Event
 {
  public $submission;
 
- /** @deprecated */
- public $form;
-
  public function __construct(Submission $submission)
  {
  $this->submission = $submission;
- $this->form = $submission; // deprecated
  }
 
  /**

src/Facades/Config.php

@@ -18,7 +18,6 @@
  * @method static mixed getDefaultLocale()
  * @method static array getOtherLocales($locale = null)
  * @method static mixed getSiteUrl($locale = null)
- * @method static array getImageManipulationPresets()
  *
  * @see \Statamic\Config
  */

src/Fields/Field.php

@@ -199,14 +199,6 @@ public function isVisibleOnListing()
  return ! in_array($this->get('listable'), [false, 'hidden'], true);
  }
 
- /**
- * @deprecated Use isVisibleOnListing() instead.
- */
- public function isVisible()
- {
- return $this->isVisibleOnListing();
- }
-
  public function isSortable()
  {
  if (is_null($this->get('sortable'))) {
@@ -249,20 +241,6 @@ public function toPublishArray()
  ]);
  }
 
- /**
- * @deprecated
- */
- public function toBlueprintArray()
- {
- return [
- 'handle' => $this->handle,
- 'type' => $this->type(),
- 'display' => $this->display(),
- 'instructions' => $this->instructions(),
- 'config' => array_except($this->preProcessedConfig(), 'type'),
- ];
- }
-
  public function setValue($value)
  {
  $this->value = $value;

src/Http/Controllers/CP/Collections/CollectionTreeController.php

@@ -68,7 +68,7 @@ private function validateUniqueUris($tree)
  }
 
  foreach ($tree->diff()->moved() as $id) {
- $page = $tree->page($id);
+ $page = $tree->find($id);
  $parent = $page->parent();
 
  $siblings = (! $parent || $parent->isRoot())

src/Http/Controllers/CP/Collections/EntriesController.php

@@ -225,7 +225,7 @@ public function update(Request $request, $collection, $entry)
  $this->validateParent($entry, $tree, $parent);
 
  $entry->afterSave(function ($entry) use ($parent, $tree) {
- if ($parent && optional($tree->page($parent))->isRoot()) {
+ if ($parent && optional($tree->find($parent))->isRoot()) {
  $parent = null;
  }
 
@@ -379,7 +379,7 @@ public function store(Request $request, $collection, $site)
  if ($structure && ! $collection->orderable()) {
  $parent = $values['parent'] ?? null;
  $entry->afterSave(function ($entry) use ($parent, $tree) {
- if ($parent && optional($tree->page($parent))->isRoot()) {
+ if ($parent && optional($tree->find($parent))->isRoot()) {
  $parent = null;
  }
 
@@ -537,7 +537,7 @@ private function entryUri($entry, $tree, $parent)
  return $entry->uri();
  }
 
- $parent = $parent ? $tree->page($parent) : null;
+ $parent = $parent ? $tree->find($parent) : null;
 
  return app(\Statamic\Contracts\Routing\UrlBuilder::class)
  ->content($entry)

src/Imaging/Manager.php

@@ -86,14 +86,6 @@ public function cpManipulationPresets()
  ];
  }
 
- /**
- * @deprecated
- */
- public function getCpImageManipulationPresets()
- {
- return $this->cpManipulationPresets();
- }
-
  /**
  * Normalize preset.
  *

src/Modifiers/CoreModifiers.php

@@ -756,20 +756,6 @@ public function formatTranslated($value, $params)
  return $this->carbon($value)->translatedFormat(Arr::get($params, 0));
  }
 
- /**
- * Converts a string to a Carbon instance and formats it according to the whim of the Overlord.
- *
- * @deprecated formatLocalized is deprecated since Carbon 2.55.0. You may want to use isoFormat instead.
- *
- * @param $value
- * @param $params
- * @return string
- */
- public function formatLocalized($value, $params)
- {
- return $this->carbon($value)->formatLocalized(Arr::get($params, 0));
- }
-
  /**
  * Format a number with grouped thousands and decimal points.
  *

src/Providers/ExtensionServiceProvider.php

@@ -119,7 +119,6 @@ class ExtensionServiceProvider extends ServiceProvider
  'piped' => 'optionList',
  'json' => 'toJson',
  'email' => 'obfuscateEmail',
- 'l10n' => 'formatLocalized',
  'lowercase' => 'lower',
  'tz' => 'timezone',
  'inFuture' => 'isFuture',

src/Stache/Repositories/EntryRepository.php

@@ -43,15 +43,6 @@ public function find($id): ?Entry
  return $this->query()->where('id', $id)->first();
  }
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection): ?Entry
- {
- return $this->query()
- ->where('slug', $slug)
- ->where('collection', $collection)
- ->first();
- }
-
  public function findByUri(string $uri, string $site = null): ?Entry
  {
  $site = $site ?? $this->stache->sites()->first();
@@ -74,7 +65,7 @@ public function findByUri(string $uri, string $site = null): ?Entry
  }
 
  return $entry->hasStructure()
- ? $entry->structure()->in($site)->page($entry->id())
+ ? $entry->structure()->in($site)->find($entry->id())
  : $entry;
  }
 

src/Stache/Repositories/TermRepository.php

@@ -91,15 +91,6 @@ public function findByUri(string $uri, string $site = null): ?Term
  return $term->collection($collection);
  }
 
- /** @deprecated */
- public function findBySlug(string $slug, string $taxonomy): ?Term
- {
- return $this->query()
- ->where('slug', $slug)
- ->where('taxonomy', $taxonomy)
- ->first();
- }
-
  public function save($term)
  {
  $this->store

src/StaticCaching/Cachers/AbstractCacher.php

@@ -68,8 +68,7 @@ public function getBaseUrl()
  */
  public function getDefaultExpiration()
  {
- return $this->config('expiry')
- ?? $this->config('default_cache_length'); // deprecated
+ return $this->config('expiry');
  }
 
  /**

src/Structures/Tree.php

@@ -140,14 +140,6 @@ public function uriCacheEnabled()
  return $this->uriCacheEnabled;
  }
 
- /**
- * @deprecated Use find() instead.
- */
- public function page($id): ?Page
- {
- return $this->find($id);
- }
-
  public function find($id): ?Page
  {
  return $this->flattenedPages()
@@ -245,7 +237,7 @@ public function append($entry)
 
  public function appendTo($parent, $page)
  {
- if ($parent && ! $this->page($parent)) {
+ if ($parent && ! $this->find($parent)) {
  throw new \Exception("Page [{$parent}] does not exist in this structure");
  }
 
@@ -287,7 +279,7 @@ private function appendToInBranches($parent, $page, $branches)
 
  public function move($entry, $target)
  {
- $parent = optional($this->page($entry)->parent());
+ $parent = optional($this->find($entry)->parent());
 
  if ($parent->id() === $target || $parent->isRoot() && is_null($target)) {
  return $this;

src/Structures/TreeBuilder.php

@@ -34,7 +34,7 @@ public function build($params)
  $entry = ($from && $from !== '/') ? Entry::findByUri(Str::start($from, '/'), $params['site']) : null;
 
  if ($entry) {
- $page = $tree->page($entry->id());
+ $page = $tree->find($entry->id());
  $pages = $page->pages()->all();
  } else {
  $pages = $tree->pages()

resources/js/components/Bard.js

@@ -8,11 +8,6 @@ class Bard {
  this.buttonCallbacks = [];
  }
 
- /** @deprecated */
- extend(callback) {
- this.addExtension(callback);
- }
-
  addExtension(callback) {
  this.extensionCallbacks.push(callback);
  }

src/Actions/DuplicateEntry.php

@@ -66,7 +66,7 @@ protected function getEntryParentFromStructure(Entry $entry)
  $parentEntry = $entry
  ->structure()
  ->in($entry->locale())
- ->page($entry->id())
+ ->find($entry->id())
  ->parent();
 
  if (! $parentEntry) {

src/Auth/Eloquent/User.php

@@ -20,14 +20,6 @@ class User extends BaseUser
  protected $roles;
  protected $groups;
 
- /** @deprecated */
- public static function fromModel(Model $model)
- {
- return tap(new static, function ($user) use ($model) {
- $user->model($model);
- });
- }
-
  public function model(Model $model = null)
  {
  if (is_null($model)) {

src/CP/Utilities/Utility.php

@@ -103,10 +103,4 @@ public function routes(Closure $routes = null)
  {
  return $this->fluentlyGetOrSet('routes')->args(func_get_args());
  }
-
- /** @deprecated */
- public function register()
- {
- \Statamic\Facades\Utility::push($this);
- }
 }

src/CP/Utilities/UtilityRepository.php

@@ -46,14 +46,6 @@ public function register($utility)
  return $utility;
  }
 
- /** @deprecated */
- public function push(Utility $utility)
- {
- $this->register($utility);
-
- return $this;
- }
-
  public function all()
  {
  return $this->utilities;

src/Config.php

@@ -2,7 +2,6 @@
 
 namespace Statamic;
 
-use Statamic\Facades\Image;
 use Statamic\Facades\Site;
 
 /**
@@ -152,17 +151,4 @@ public function getSiteUrl($locale = null)
  {
  return $this->getSite($locale)->url();
  }
-
- /**
- * Get the image manipulation presets.
- *
- * @return array
- *
- * @deprecated Use Statamic\Facades\Image::userManipulationPresets()
- * or Image::manipulationPresets() to get merged with CP presets.
- */
- public function getImageManipulationPresets()
- {
- return Image::userManipulationPresets();
- }
 }

src/Contracts/Entries/EntryRepository.php

@@ -14,9 +14,6 @@ public function find($id);
 
  public function findByUri(string $uri);
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection);
-
  public function make();
 
  public function query();

src/Contracts/Taxonomies/TermRepository.php

@@ -14,9 +14,6 @@ public function find($id);
 
  public function findByUri(string $uri);
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection);
-
  public function make(string $slug = null);
 
  public function query();

src/Entries/Entry.php

@@ -676,7 +676,7 @@ public function page()
  return null;
  }
 
- return $this->structure()->in($this->locale())->page($id);
+ return $this->structure()->in($this->locale())->find($id);
  }
 
  public function route()

src/Events/FormSubmitted.php

@@ -8,13 +8,9 @@ class FormSubmitted extends Event
 {
  public $submission;
 
- /** @deprecated */
- public $form;
-
  public function __construct(Submission $submission)
  {
  $this->submission = $submission;
- $this->form = $submission; // deprecated
  }
 
  /**

src/Facades/Config.php

@@ -18,7 +18,6 @@
  * @method static mixed getDefaultLocale()
  * @method static array getOtherLocales($locale = null)
  * @method static mixed getSiteUrl($locale = null)
- * @method static array getImageManipulationPresets()
  *
  * @see \Statamic\Config
  */

src/Fields/Field.php

@@ -199,14 +199,6 @@ public function isVisibleOnListing()
  return ! in_array($this->get('listable'), [false, 'hidden'], true);
  }
 
- /**
- * @deprecated Use isVisibleOnListing() instead.
- */
- public function isVisible()
- {
- return $this->isVisibleOnListing();
- }
-
  public function isSortable()
  {
  if (is_null($this->get('sortable'))) {
@@ -249,20 +241,6 @@ public function toPublishArray()
  ]);
  }
 
- /**
- * @deprecated
- */
- public function toBlueprintArray()
- {
- return [
- 'handle' => $this->handle,
- 'type' => $this->type(),
- 'display' => $this->display(),
- 'instructions' => $this->instructions(),
- 'config' => array_except($this->preProcessedConfig(), 'type'),
- ];
- }
-
  public function setValue($value)
  {
  $this->value = $value;

src/Http/Controllers/CP/Collections/CollectionTreeController.php

@@ -68,7 +68,7 @@ private function validateUniqueUris($tree)
  }
 
  foreach ($tree->diff()->moved() as $id) {
- $page = $tree->page($id);
+ $page = $tree->find($id);
  $parent = $page->parent();
 
  $siblings = (! $parent || $parent->isRoot())

src/Http/Controllers/CP/Collections/EntriesController.php

@@ -225,7 +225,7 @@ public function update(Request $request, $collection, $entry)
  $this->validateParent($entry, $tree, $parent);
 
  $entry->afterSave(function ($entry) use ($parent, $tree) {
- if ($parent && optional($tree->page($parent))->isRoot()) {
+ if ($parent && optional($tree->find($parent))->isRoot()) {
  $parent = null;
  }
 
@@ -379,7 +379,7 @@ public function store(Request $request, $collection, $site)
  if ($structure && ! $collection->orderable()) {
  $parent = $values['parent'] ?? null;
  $entry->afterSave(function ($entry) use ($parent, $tree) {
- if ($parent && optional($tree->page($parent))->isRoot()) {
+ if ($parent && optional($tree->find($parent))->isRoot()) {
  $parent = null;
  }
 
@@ -537,7 +537,7 @@ private function entryUri($entry, $tree, $parent)
  return $entry->uri();
  }
 
- $parent = $parent ? $tree->page($parent) : null;
+ $parent = $parent ? $tree->find($parent) : null;
 
  return app(\Statamic\Contracts\Routing\UrlBuilder::class)
  ->content($entry)

src/Imaging/Manager.php

@@ -86,14 +86,6 @@ public function cpManipulationPresets()
  ];
  }
 
- /**
- * @deprecated
- */
- public function getCpImageManipulationPresets()
- {
- return $this->cpManipulationPresets();
- }
-
  /**
  * Normalize preset.
  *

src/Modifiers/CoreModifiers.php

@@ -756,20 +756,6 @@ public function formatTranslated($value, $params)
  return $this->carbon($value)->translatedFormat(Arr::get($params, 0));
  }
 
- /**
- * Converts a string to a Carbon instance and formats it according to the whim of the Overlord.
- *
- * @deprecated formatLocalized is deprecated since Carbon 2.55.0. You may want to use isoFormat instead.
- *
- * @param $value
- * @param $params
- * @return string
- */
- public function formatLocalized($value, $params)
- {
- return $this->carbon($value)->formatLocalized(Arr::get($params, 0));
- }
-
  /**
  * Format a number with grouped thousands and decimal points.
  *

src/Providers/ExtensionServiceProvider.php

@@ -119,7 +119,6 @@ class ExtensionServiceProvider extends ServiceProvider
  'piped' => 'optionList',
  'json' => 'toJson',
  'email' => 'obfuscateEmail',
- 'l10n' => 'formatLocalized',
  'lowercase' => 'lower',
  'tz' => 'timezone',
  'inFuture' => 'isFuture',

src/Stache/Repositories/EntryRepository.php

@@ -43,15 +43,6 @@ public function find($id): ?Entry
  return $this->query()->where('id', $id)->first();
  }
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection): ?Entry
- {
- return $this->query()
- ->where('slug', $slug)
- ->where('collection', $collection)
- ->first();
- }
-
  public function findByUri(string $uri, string $site = null): ?Entry
  {
  $site = $site ?? $this->stache->sites()->first();
@@ -74,7 +65,7 @@ public function findByUri(string $uri, string $site = null): ?Entry
  }
 
  return $entry->hasStructure()
- ? $entry->structure()->in($site)->page($entry->id())
+ ? $entry->structure()->in($site)->find($entry->id())
  : $entry;
  }
 

src/Stache/Repositories/TermRepository.php

@@ -91,15 +91,6 @@ public function findByUri(string $uri, string $site = null): ?Term
  return $term->collection($collection);
  }
 
- /** @deprecated */
- public function findBySlug(string $slug, string $taxonomy): ?Term
- {
- return $this->query()
- ->where('slug', $slug)
- ->where('taxonomy', $taxonomy)
- ->first();
- }
-
  public function save($term)
  {
  $this->store

src/StaticCaching/Cachers/AbstractCacher.php

@@ -68,8 +68,7 @@ public function getBaseUrl()
  */
  public function getDefaultExpiration()
  {
- return $this->config('expiry')
- ?? $this->config('default_cache_length'); // deprecated
+ return $this->config('expiry');
  }
 
  /**

src/Structures/Tree.php

@@ -140,14 +140,6 @@ public function uriCacheEnabled()
  return $this->uriCacheEnabled;
  }
 
- /**
- * @deprecated Use find() instead.
- */
- public function page($id): ?Page
- {
- return $this->find($id);
- }
-
  public function find($id): ?Page
  {
  return $this->flattenedPages()
@@ -245,7 +237,7 @@ public function append($entry)
 
  public function appendTo($parent, $page)
  {
- if ($parent && ! $this->page($parent)) {
+ if ($parent && ! $this->find($parent)) {
  throw new \Exception("Page [{$parent}] does not exist in this structure");
  }
 
@@ -287,7 +279,7 @@ private function appendToInBranches($parent, $page, $branches)
 
  public function move($entry, $target)
  {
- $parent = optional($this->page($entry)->parent());
+ $parent = optional($this->find($entry)->parent());
 
  if ($parent->id() === $target || $parent->isRoot() && is_null($target)) {
  return $this;

src/Structures/TreeBuilder.php

@@ -34,7 +34,7 @@ public function build($params)
  $entry = ($from && $from !== '/') ? Entry::findByUri(Str::start($from, '/'), $params['site']) : null;
 
  if ($entry) {
- $page = $tree->page($entry->id());
+ $page = $tree->find($entry->id());
  $pages = $page->pages()->all();
  } else {
  $pages = $tree->pages()

resources/js/components/Bard.js

@@ -8,11 +8,6 @@ class Bard {
  this.buttonCallbacks = [];
  }
 
- /** @deprecated */
- extend(callback) {
- this.addExtension(callback);
- }
-
  addExtension(callback) {
  this.extensionCallbacks.push(callback);
  }

src/Actions/DuplicateEntry.php

@@ -66,7 +66,7 @@ protected function getEntryParentFromStructure(Entry $entry)
  $parentEntry = $entry
  ->structure()
  ->in($entry->locale())
- ->page($entry->id())
+ ->find($entry->id())
  ->parent();
 
  if (! $parentEntry) {

src/Auth/Eloquent/User.php

@@ -20,14 +20,6 @@ class User extends BaseUser
  protected $roles;
  protected $groups;
 
- /** @deprecated */
- public static function fromModel(Model $model)
- {
- return tap(new static, function ($user) use ($model) {
- $user->model($model);
- });
- }
-
  public function model(Model $model = null)
  {
  if (is_null($model)) {

src/CP/Utilities/Utility.php

@@ -103,10 +103,4 @@ public function routes(Closure $routes = null)
  {
  return $this->fluentlyGetOrSet('routes')->args(func_get_args());
  }
-
- /** @deprecated */
- public function register()
- {
- \Statamic\Facades\Utility::push($this);
- }
 }

src/CP/Utilities/UtilityRepository.php

@@ -46,14 +46,6 @@ public function register($utility)
  return $utility;
  }
 
- /** @deprecated */
- public function push(Utility $utility)
- {
- $this->register($utility);
-
- return $this;
- }
-
  public function all()
  {
  return $this->utilities;

src/Config.php

@@ -2,7 +2,6 @@
 
 namespace Statamic;
 
-use Statamic\Facades\Image;
 use Statamic\Facades\Site;
 
 /**
@@ -152,17 +151,4 @@ public function getSiteUrl($locale = null)
  {
  return $this->getSite($locale)->url();
  }
-
- /**
- * Get the image manipulation presets.
- *
- * @return array
- *
- * @deprecated Use Statamic\Facades\Image::userManipulationPresets()
- * or Image::manipulationPresets() to get merged with CP presets.
- */
- public function getImageManipulationPresets()
- {
- return Image::userManipulationPresets();
- }
 }

src/Contracts/Entries/EntryRepository.php

@@ -14,9 +14,6 @@ public function find($id);
 
  public function findByUri(string $uri);
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection);
-
  public function make();
 
  public function query();

src/Contracts/Taxonomies/TermRepository.php

@@ -14,9 +14,6 @@ public function find($id);
 
  public function findByUri(string $uri);
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection);
-
  public function make(string $slug = null);
 
  public function query();

src/Entries/Entry.php

@@ -676,7 +676,7 @@ public function page()
  return null;
  }
 
- return $this->structure()->in($this->locale())->page($id);
+ return $this->structure()->in($this->locale())->find($id);
  }
 
  public function route()

src/Events/FormSubmitted.php

@@ -8,13 +8,9 @@ class FormSubmitted extends Event
 {
  public $submission;
 
- /** @deprecated */
- public $form;
-
  public function __construct(Submission $submission)
  {
  $this->submission = $submission;
- $this->form = $submission; // deprecated
  }
 
  /**

src/Facades/Config.php

@@ -18,7 +18,6 @@
  * @method static mixed getDefaultLocale()
  * @method static array getOtherLocales($locale = null)
  * @method static mixed getSiteUrl($locale = null)
- * @method static array getImageManipulationPresets()
  *
  * @see \Statamic\Config
  */

src/Fields/Field.php

@@ -199,14 +199,6 @@ public function isVisibleOnListing()
  return ! in_array($this->get('listable'), [false, 'hidden'], true);
  }
 
- /**
- * @deprecated Use isVisibleOnListing() instead.
- */
- public function isVisible()
- {
- return $this->isVisibleOnListing();
- }
-
  public function isSortable()
  {
  if (is_null($this->get('sortable'))) {
@@ -249,20 +241,6 @@ public function toPublishArray()
  ]);
  }
 
- /**
- * @deprecated
- */
- public function toBlueprintArray()
- {
- return [
- 'handle' => $this->handle,
- 'type' => $this->type(),
- 'display' => $this->display(),
- 'instructions' => $this->instructions(),
- 'config' => array_except($this->preProcessedConfig(), 'type'),
- ];
- }
-
  public function setValue($value)
  {
  $this->value = $value;

src/Http/Controllers/CP/Collections/CollectionTreeController.php

@@ -68,7 +68,7 @@ private function validateUniqueUris($tree)
  }
 
  foreach ($tree->diff()->moved() as $id) {
- $page = $tree->page($id);
+ $page = $tree->find($id);
  $parent = $page->parent();
 
  $siblings = (! $parent || $parent->isRoot())

src/Http/Controllers/CP/Collections/EntriesController.php

@@ -225,7 +225,7 @@ public function update(Request $request, $collection, $entry)
  $this->validateParent($entry, $tree, $parent);
 
  $entry->afterSave(function ($entry) use ($parent, $tree) {
- if ($parent && optional($tree->page($parent))->isRoot()) {
+ if ($parent && optional($tree->find($parent))->isRoot()) {
  $parent = null;
  }
 
@@ -379,7 +379,7 @@ public function store(Request $request, $collection, $site)
  if ($structure && ! $collection->orderable()) {
  $parent = $values['parent'] ?? null;
  $entry->afterSave(function ($entry) use ($parent, $tree) {
- if ($parent && optional($tree->page($parent))->isRoot()) {
+ if ($parent && optional($tree->find($parent))->isRoot()) {
  $parent = null;
  }
 
@@ -537,7 +537,7 @@ private function entryUri($entry, $tree, $parent)
  return $entry->uri();
  }
 
- $parent = $parent ? $tree->page($parent) : null;
+ $parent = $parent ? $tree->find($parent) : null;
 
  return app(\Statamic\Contracts\Routing\UrlBuilder::class)
  ->content($entry)

src/Imaging/Manager.php

@@ -86,14 +86,6 @@ public function cpManipulationPresets()
  ];
  }
 
- /**
- * @deprecated
- */
- public function getCpImageManipulationPresets()
- {
- return $this->cpManipulationPresets();
- }
-
  /**
  * Normalize preset.
  *

src/Modifiers/CoreModifiers.php

@@ -756,20 +756,6 @@ public function formatTranslated($value, $params)
  return $this->carbon($value)->translatedFormat(Arr::get($params, 0));
  }
 
- /**
- * Converts a string to a Carbon instance and formats it according to the whim of the Overlord.
- *
- * @deprecated formatLocalized is deprecated since Carbon 2.55.0. You may want to use isoFormat instead.
- *
- * @param $value
- * @param $params
- * @return string
- */
- public function formatLocalized($value, $params)
- {
- return $this->carbon($value)->formatLocalized(Arr::get($params, 0));
- }
-
  /**
  * Format a number with grouped thousands and decimal points.
  *

src/Providers/ExtensionServiceProvider.php

@@ -119,7 +119,6 @@ class ExtensionServiceProvider extends ServiceProvider
  'piped' => 'optionList',
  'json' => 'toJson',
  'email' => 'obfuscateEmail',
- 'l10n' => 'formatLocalized',
  'lowercase' => 'lower',
  'tz' => 'timezone',
  'inFuture' => 'isFuture',

src/Stache/Repositories/EntryRepository.php

@@ -43,15 +43,6 @@ public function find($id): ?Entry
  return $this->query()->where('id', $id)->first();
  }
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection): ?Entry
- {
- return $this->query()
- ->where('slug', $slug)
- ->where('collection', $collection)
- ->first();
- }
-
  public function findByUri(string $uri, string $site = null): ?Entry
  {
  $site = $site ?? $this->stache->sites()->first();
@@ -74,7 +65,7 @@ public function findByUri(string $uri, string $site = null): ?Entry
  }
 
  return $entry->hasStructure()
- ? $entry->structure()->in($site)->page($entry->id())
+ ? $entry->structure()->in($site)->find($entry->id())
  : $entry;
  }
 

src/Stache/Repositories/TermRepository.php

@@ -91,15 +91,6 @@ public function findByUri(string $uri, string $site = null): ?Term
  return $term->collection($collection);
  }
 
- /** @deprecated */
- public function findBySlug(string $slug, string $taxonomy): ?Term
- {
- return $this->query()
- ->where('slug', $slug)
- ->where('taxonomy', $taxonomy)
- ->first();
- }
-
  public function save($term)
  {
  $this->store

src/StaticCaching/Cachers/AbstractCacher.php

@@ -68,8 +68,7 @@ public function getBaseUrl()
  */
  public function getDefaultExpiration()
  {
- return $this->config('expiry')
- ?? $this->config('default_cache_length'); // deprecated
+ return $this->config('expiry');
  }
 
  /**

src/Structures/Tree.php

@@ -140,14 +140,6 @@ public function uriCacheEnabled()
  return $this->uriCacheEnabled;
  }
 
- /**
- * @deprecated Use find() instead.
- */
- public function page($id): ?Page
- {
- return $this->find($id);
- }
-
  public function find($id): ?Page
  {
  return $this->flattenedPages()
@@ -245,7 +237,7 @@ public function append($entry)
 
  public function appendTo($parent, $page)
  {
- if ($parent && ! $this->page($parent)) {
+ if ($parent && ! $this->find($parent)) {
  throw new \Exception("Page [{$parent}] does not exist in this structure");
  }
 
@@ -287,7 +279,7 @@ private function appendToInBranches($parent, $page, $branches)
 
  public function move($entry, $target)
  {
- $parent = optional($this->page($entry)->parent());
+ $parent = optional($this->find($entry)->parent());
 
  if ($parent->id() === $target || $parent->isRoot() && is_null($target)) {
  return $this;

src/Structures/TreeBuilder.php

@@ -34,7 +34,7 @@ public function build($params)
  $entry = ($from && $from !== '/') ? Entry::findByUri(Str::start($from, '/'), $params['site']) : null;
 
  if ($entry) {
- $page = $tree->page($entry->id());
+ $page = $tree->find($entry->id());
  $pages = $page->pages()->all();
  } else {
  $pages = $tree->pages()

resources/js/components/Bard.js

@@ -8,11 +8,6 @@ class Bard {
  this.buttonCallbacks = [];
  }
 
- /** @deprecated */
- extend(callback) {
- this.addExtension(callback);
- }
-
  addExtension(callback) {
  this.extensionCallbacks.push(callback);
  }

src/Actions/DuplicateEntry.php

@@ -66,7 +66,7 @@ protected function getEntryParentFromStructure(Entry $entry)
  $parentEntry = $entry
  ->structure()
  ->in($entry->locale())
- ->page($entry->id())
+ ->find($entry->id())
  ->parent();
 
  if (! $parentEntry) {

src/Auth/Eloquent/User.php

@@ -20,14 +20,6 @@ class User extends BaseUser
  protected $roles;
  protected $groups;
 
- /** @deprecated */
- public static function fromModel(Model $model)
- {
- return tap(new static, function ($user) use ($model) {
- $user->model($model);
- });
- }
-
  public function model(Model $model = null)
  {
  if (is_null($model)) {

src/CP/Utilities/Utility.php

@@ -103,10 +103,4 @@ public function routes(Closure $routes = null)
  {
  return $this->fluentlyGetOrSet('routes')->args(func_get_args());
  }
-
- /** @deprecated */
- public function register()
- {
- \Statamic\Facades\Utility::push($this);
- }
 }

src/CP/Utilities/UtilityRepository.php

@@ -46,14 +46,6 @@ public function register($utility)
  return $utility;
  }
 
- /** @deprecated */
- public function push(Utility $utility)
- {
- $this->register($utility);
-
- return $this;
- }
-
  public function all()
  {
  return $this->utilities;

src/Config.php

@@ -2,7 +2,6 @@
 
 namespace Statamic;
 
-use Statamic\Facades\Image;
 use Statamic\Facades\Site;
 
 /**
@@ -152,17 +151,4 @@ public function getSiteUrl($locale = null)
  {
  return $this->getSite($locale)->url();
  }
-
- /**
- * Get the image manipulation presets.
- *
- * @return array
- *
- * @deprecated Use Statamic\Facades\Image::userManipulationPresets()
- * or Image::manipulationPresets() to get merged with CP presets.
- */
- public function getImageManipulationPresets()
- {
- return Image::userManipulationPresets();
- }
 }

src/Contracts/Entries/EntryRepository.php

@@ -14,9 +14,6 @@ public function find($id);
 
  public function findByUri(string $uri);
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection);
-
  public function make();
 
  public function query();

src/Contracts/Taxonomies/TermRepository.php

@@ -14,9 +14,6 @@ public function find($id);
 
  public function findByUri(string $uri);
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection);
-
  public function make(string $slug = null);
 
  public function query();

src/Entries/Entry.php

@@ -676,7 +676,7 @@ public function page()
  return null;
  }
 
- return $this->structure()->in($this->locale())->page($id);
+ return $this->structure()->in($this->locale())->find($id);
  }
 
  public function route()

src/Events/FormSubmitted.php

@@ -8,13 +8,9 @@ class FormSubmitted extends Event
 {
  public $submission;
 
- /** @deprecated */
- public $form;
-
  public function __construct(Submission $submission)
  {
  $this->submission = $submission;
- $this->form = $submission; // deprecated
  }
 
  /**

src/Facades/Config.php

@@ -18,7 +18,6 @@
  * @method static mixed getDefaultLocale()
  * @method static array getOtherLocales($locale = null)
  * @method static mixed getSiteUrl($locale = null)
- * @method static array getImageManipulationPresets()
  *
  * @see \Statamic\Config
  */

src/Fields/Field.php

@@ -199,14 +199,6 @@ public function isVisibleOnListing()
  return ! in_array($this->get('listable'), [false, 'hidden'], true);
  }
 
- /**
- * @deprecated Use isVisibleOnListing() instead.
- */
- public function isVisible()
- {
- return $this->isVisibleOnListing();
- }
-
  public function isSortable()
  {
  if (is_null($this->get('sortable'))) {
@@ -249,20 +241,6 @@ public function toPublishArray()
  ]);
  }
 
- /**
- * @deprecated
- */
- public function toBlueprintArray()
- {
- return [
- 'handle' => $this->handle,
- 'type' => $this->type(),
- 'display' => $this->display(),
- 'instructions' => $this->instructions(),
- 'config' => array_except($this->preProcessedConfig(), 'type'),
- ];
- }
-
  public function setValue($value)
  {
  $this->value = $value;

src/Http/Controllers/CP/Collections/CollectionTreeController.php

@@ -68,7 +68,7 @@ private function validateUniqueUris($tree)
  }
 
  foreach ($tree->diff()->moved() as $id) {
- $page = $tree->page($id);
+ $page = $tree->find($id);
  $parent = $page->parent();
 
  $siblings = (! $parent || $parent->isRoot())

src/Http/Controllers/CP/Collections/EntriesController.php

@@ -225,7 +225,7 @@ public function update(Request $request, $collection, $entry)
  $this->validateParent($entry, $tree, $parent);
 
  $entry->afterSave(function ($entry) use ($parent, $tree) {
- if ($parent && optional($tree->page($parent))->isRoot()) {
+ if ($parent && optional($tree->find($parent))->isRoot()) {
  $parent = null;
  }
 
@@ -379,7 +379,7 @@ public function store(Request $request, $collection, $site)
  if ($structure && ! $collection->orderable()) {
  $parent = $values['parent'] ?? null;
  $entry->afterSave(function ($entry) use ($parent, $tree) {
- if ($parent && optional($tree->page($parent))->isRoot()) {
+ if ($parent && optional($tree->find($parent))->isRoot()) {
  $parent = null;
  }
 
@@ -537,7 +537,7 @@ private function entryUri($entry, $tree, $parent)
  return $entry->uri();
  }
 
- $parent = $parent ? $tree->page($parent) : null;
+ $parent = $parent ? $tree->find($parent) : null;
 
  return app(\Statamic\Contracts\Routing\UrlBuilder::class)
  ->content($entry)

src/Imaging/Manager.php

@@ -86,14 +86,6 @@ public function cpManipulationPresets()
  ];
  }
 
- /**
- * @deprecated
- */
- public function getCpImageManipulationPresets()
- {
- return $this->cpManipulationPresets();
- }
-
  /**
  * Normalize preset.
  *

src/Modifiers/CoreModifiers.php

@@ -756,20 +756,6 @@ public function formatTranslated($value, $params)
  return $this->carbon($value)->translatedFormat(Arr::get($params, 0));
  }
 
- /**
- * Converts a string to a Carbon instance and formats it according to the whim of the Overlord.
- *
- * @deprecated formatLocalized is deprecated since Carbon 2.55.0. You may want to use isoFormat instead.
- *
- * @param $value
- * @param $params
- * @return string
- */
- public function formatLocalized($value, $params)
- {
- return $this->carbon($value)->formatLocalized(Arr::get($params, 0));
- }
-
  /**
  * Format a number with grouped thousands and decimal points.
  *

src/Providers/ExtensionServiceProvider.php

@@ -119,7 +119,6 @@ class ExtensionServiceProvider extends ServiceProvider
  'piped' => 'optionList',
  'json' => 'toJson',
  'email' => 'obfuscateEmail',
- 'l10n' => 'formatLocalized',
  'lowercase' => 'lower',
  'tz' => 'timezone',
  'inFuture' => 'isFuture',

src/Stache/Repositories/EntryRepository.php

@@ -43,15 +43,6 @@ public function find($id): ?Entry
  return $this->query()->where('id', $id)->first();
  }
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection): ?Entry
- {
- return $this->query()
- ->where('slug', $slug)
- ->where('collection', $collection)
- ->first();
- }
-
  public function findByUri(string $uri, string $site = null): ?Entry
  {
  $site = $site ?? $this->stache->sites()->first();
@@ -74,7 +65,7 @@ public function findByUri(string $uri, string $site = null): ?Entry
  }
 
  return $entry->hasStructure()
- ? $entry->structure()->in($site)->page($entry->id())
+ ? $entry->structure()->in($site)->find($entry->id())
  : $entry;
  }
 

src/Stache/Repositories/TermRepository.php

@@ -91,15 +91,6 @@ public function findByUri(string $uri, string $site = null): ?Term
  return $term->collection($collection);
  }
 
- /** @deprecated */
- public function findBySlug(string $slug, string $taxonomy): ?Term
- {
- return $this->query()
- ->where('slug', $slug)
- ->where('taxonomy', $taxonomy)
- ->first();
- }
-
  public function save($term)
  {
  $this->store

src/StaticCaching/Cachers/AbstractCacher.php

@@ -68,8 +68,7 @@ public function getBaseUrl()
  */
  public function getDefaultExpiration()
  {
- return $this->config('expiry')
- ?? $this->config('default_cache_length'); // deprecated
+ return $this->config('expiry');
  }
 
  /**

src/Structures/Tree.php

@@ -140,14 +140,6 @@ public function uriCacheEnabled()
  return $this->uriCacheEnabled;
  }
 
- /**
- * @deprecated Use find() instead.
- */
- public function page($id): ?Page
- {
- return $this->find($id);
- }
-
  public function find($id): ?Page
  {
  return $this->flattenedPages()
@@ -245,7 +237,7 @@ public function append($entry)
 
  public function appendTo($parent, $page)
  {
- if ($parent && ! $this->page($parent)) {
+ if ($parent && ! $this->find($parent)) {
  throw new \Exception("Page [{$parent}] does not exist in this structure");
  }
 
@@ -287,7 +279,7 @@ private function appendToInBranches($parent, $page, $branches)
 
  public function move($entry, $target)
  {
- $parent = optional($this->page($entry)->parent());
+ $parent = optional($this->find($entry)->parent());
 
  if ($parent->id() === $target || $parent->isRoot() && is_null($target)) {
  return $this;

src/Structures/TreeBuilder.php

@@ -34,7 +34,7 @@ public function build($params)
  $entry = ($from && $from !== '/') ? Entry::findByUri(Str::start($from, '/'), $params['site']) : null;
 
  if ($entry) {
- $page = $tree->page($entry->id());
+ $page = $tree->find($entry->id());
  $pages = $page->pages()->all();
  } else {
  $pages = $tree->pages()

resources/js/components/Bard.js

@@ -8,11 +8,6 @@ class Bard {
  this.buttonCallbacks = [];
  }
 
- /** @deprecated */
- extend(callback) {
- this.addExtension(callback);
- }
-
  addExtension(callback) {
  this.extensionCallbacks.push(callback);
  }

src/Actions/DuplicateEntry.php

@@ -66,7 +66,7 @@ protected function getEntryParentFromStructure(Entry $entry)
  $parentEntry = $entry
  ->structure()
  ->in($entry->locale())
- ->page($entry->id())
+ ->find($entry->id())
  ->parent();
 
  if (! $parentEntry) {

src/Auth/Eloquent/User.php

@@ -20,14 +20,6 @@ class User extends BaseUser
  protected $roles;
  protected $groups;
 
- /** @deprecated */
- public static function fromModel(Model $model)
- {
- return tap(new static, function ($user) use ($model) {
- $user->model($model);
- });
- }
-
  public function model(Model $model = null)
  {
  if (is_null($model)) {

src/CP/Utilities/Utility.php

@@ -103,10 +103,4 @@ public function routes(Closure $routes = null)
  {
  return $this->fluentlyGetOrSet('routes')->args(func_get_args());
  }
-
- /** @deprecated */
- public function register()
- {
- \Statamic\Facades\Utility::push($this);
- }
 }

src/CP/Utilities/UtilityRepository.php

@@ -46,14 +46,6 @@ public function register($utility)
  return $utility;
  }
 
- /** @deprecated */
- public function push(Utility $utility)
- {
- $this->register($utility);
-
- return $this;
- }
-
  public function all()
  {
  return $this->utilities;

src/Config.php

@@ -2,7 +2,6 @@
 
 namespace Statamic;
 
-use Statamic\Facades\Image;
 use Statamic\Facades\Site;
 
 /**
@@ -152,17 +151,4 @@ public function getSiteUrl($locale = null)
  {
  return $this->getSite($locale)->url();
  }
-
- /**
- * Get the image manipulation presets.
- *
- * @return array
- *
- * @deprecated Use Statamic\Facades\Image::userManipulationPresets()
- * or Image::manipulationPresets() to get merged with CP presets.
- */
- public function getImageManipulationPresets()
- {
- return Image::userManipulationPresets();
- }
 }

src/Contracts/Entries/EntryRepository.php

@@ -14,9 +14,6 @@ public function find($id);
 
  public function findByUri(string $uri);
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection);
-
  public function make();
 
  public function query();

src/Contracts/Taxonomies/TermRepository.php

@@ -14,9 +14,6 @@ public function find($id);
 
  public function findByUri(string $uri);
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection);
-
  public function make(string $slug = null);
 
  public function query();

src/Entries/Entry.php

@@ -676,7 +676,7 @@ public function page()
  return null;
  }
 
- return $this->structure()->in($this->locale())->page($id);
+ return $this->structure()->in($this->locale())->find($id);
  }
 
  public function route()

src/Events/FormSubmitted.php

@@ -8,13 +8,9 @@ class FormSubmitted extends Event
 {
  public $submission;
 
- /** @deprecated */
- public $form;
-
  public function __construct(Submission $submission)
  {
  $this->submission = $submission;
- $this->form = $submission; // deprecated
  }
 
  /**

src/Facades/Config.php

@@ -18,7 +18,6 @@
  * @method static mixed getDefaultLocale()
  * @method static array getOtherLocales($locale = null)
  * @method static mixed getSiteUrl($locale = null)
- * @method static array getImageManipulationPresets()
  *
  * @see \Statamic\Config
  */

src/Fields/Field.php

@@ -199,14 +199,6 @@ public function isVisibleOnListing()
  return ! in_array($this->get('listable'), [false, 'hidden'], true);
  }
 
- /**
- * @deprecated Use isVisibleOnListing() instead.
- */
- public function isVisible()
- {
- return $this->isVisibleOnListing();
- }
-
  public function isSortable()
  {
  if (is_null($this->get('sortable'))) {
@@ -249,20 +241,6 @@ public function toPublishArray()
  ]);
  }
 
- /**
- * @deprecated
- */
- public function toBlueprintArray()
- {
- return [
- 'handle' => $this->handle,
- 'type' => $this->type(),
- 'display' => $this->display(),
- 'instructions' => $this->instructions(),
- 'config' => array_except($this->preProcessedConfig(), 'type'),
- ];
- }
-
  public function setValue($value)
  {
  $this->value = $value;

src/Http/Controllers/CP/Collections/CollectionTreeController.php

@@ -68,7 +68,7 @@ private function validateUniqueUris($tree)
  }
 
  foreach ($tree->diff()->moved() as $id) {
- $page = $tree->page($id);
+ $page = $tree->find($id);
  $parent = $page->parent();
 
  $siblings = (! $parent || $parent->isRoot())

src/Http/Controllers/CP/Collections/EntriesController.php

@@ -225,7 +225,7 @@ public function update(Request $request, $collection, $entry)
  $this->validateParent($entry, $tree, $parent);
 
  $entry->afterSave(function ($entry) use ($parent, $tree) {
- if ($parent && optional($tree->page($parent))->isRoot()) {
+ if ($parent && optional($tree->find($parent))->isRoot()) {
  $parent = null;
  }
 
@@ -379,7 +379,7 @@ public function store(Request $request, $collection, $site)
  if ($structure && ! $collection->orderable()) {
  $parent = $values['parent'] ?? null;
  $entry->afterSave(function ($entry) use ($parent, $tree) {
- if ($parent && optional($tree->page($parent))->isRoot()) {
+ if ($parent && optional($tree->find($parent))->isRoot()) {
  $parent = null;
  }
 
@@ -537,7 +537,7 @@ private function entryUri($entry, $tree, $parent)
  return $entry->uri();
  }
 
- $parent = $parent ? $tree->page($parent) : null;
+ $parent = $parent ? $tree->find($parent) : null;
 
  return app(\Statamic\Contracts\Routing\UrlBuilder::class)
  ->content($entry)

src/Imaging/Manager.php

@@ -86,14 +86,6 @@ public function cpManipulationPresets()
  ];
  }
 
- /**
- * @deprecated
- */
- public function getCpImageManipulationPresets()
- {
- return $this->cpManipulationPresets();
- }
-
  /**
  * Normalize preset.
  *

src/Modifiers/CoreModifiers.php

@@ -756,20 +756,6 @@ public function formatTranslated($value, $params)
  return $this->carbon($value)->translatedFormat(Arr::get($params, 0));
  }
 
- /**
- * Converts a string to a Carbon instance and formats it according to the whim of the Overlord.
- *
- * @deprecated formatLocalized is deprecated since Carbon 2.55.0. You may want to use isoFormat instead.
- *
- * @param $value
- * @param $params
- * @return string
- */
- public function formatLocalized($value, $params)
- {
- return $this->carbon($value)->formatLocalized(Arr::get($params, 0));
- }
-
  /**
  * Format a number with grouped thousands and decimal points.
  *

src/Providers/ExtensionServiceProvider.php

@@ -119,7 +119,6 @@ class ExtensionServiceProvider extends ServiceProvider
  'piped' => 'optionList',
  'json' => 'toJson',
  'email' => 'obfuscateEmail',
- 'l10n' => 'formatLocalized',
  'lowercase' => 'lower',
  'tz' => 'timezone',
  'inFuture' => 'isFuture',

src/Stache/Repositories/EntryRepository.php

@@ -43,15 +43,6 @@ public function find($id): ?Entry
  return $this->query()->where('id', $id)->first();
  }
 
- /** @deprecated */
- public function findBySlug(string $slug, string $collection): ?Entry
- {
- return $this->query()
- ->where('slug', $slug)
- ->where('collection', $collection)
- ->first();
- }
-
  public function findByUri(string $uri, string $site = null): ?Entry
  {
  $site = $site ?? $this->stache->sites()->first();
@@ -74,7 +65,7 @@ public function findByUri(string $uri, string $site = null): ?Entry
  }
 
  return $entry->hasStructure()
- ? $entry->structure()->in($site)->page($entry->id())
+ ? $entry->structure()->in($site)->find($entry->id())
  : $entry;
  }
 

src/Stache/Repositories/TermRepository.php

@@ -91,15 +91,6 @@ public function findByUri(string $uri, string $site = null): ?Term
  return $term->collection($collection);
  }
 
- /** @deprecated */
- public function findBySlug(string $slug, string $taxonomy): ?Term
- {
- return $this->query()
- ->where('slug', $slug)
- ->where('taxonomy', $taxonomy)
- ->first();
- }
-
  public function save($term)
  {
  $this->store

src/StaticCaching/Cachers/AbstractCacher.php

@@ -68,8 +68,7 @@ public function getBaseUrl()
  */
  public function getDefaultExpiration()
  {
- return $this->config('expiry')
- ?? $this->config('default_cache_length'); // deprecated
+ return $this->config('expiry');
  }
 
  /**

src/Structures/Tree.php

@@ -140,14 +140,6 @@ public function uriCacheEnabled()
  return $this->uriCacheEnabled;
  }
 
- /**
- * @deprecated Use find() instead.
- */
- public function page($id): ?Page
- {
- return $this->find($id);
- }
-
  public function find($id): ?Page
  {
  return $this->flattenedPages()
@@ -245,7 +237,7 @@ public function append($entry)
 
  public function appendTo($parent, $page)
  {
- if ($parent && ! $this->page($parent)) {
+ if ($parent && ! $this->find($parent)) {
  throw new \Exception("Page [{$parent}] does not exist in this structure");
  }
 
@@ -287,7 +279,7 @@ private function appendToInBranches($parent, $page, $branches)
 
  public function move($entry, $target)
  {
- $parent = optional($this->page($entry)->parent());
+ $parent = optional($this->find($entry)->parent());
 
  if ($parent->id() === $target || $parent->isRoot() && is_null($target)) {
  return $this;

src/Structures/TreeBuilder.php

@@ -34,7 +34,7 @@ public function build($params)
  $entry = ($from && $from !== '/') ? Entry::findByUri(Str::start($from, '/'), $params['site']) : null;
 
  if ($entry) {
- $page = $tree->page($entry->id());
+ $page = $tree->find($entry->id());
  $pages = $page->pages()->all();
  } else {
  $pages = $tree->pages()