diff --git a/core/lib/Drupal/Component/PhpStorage/FileStorage.php b/core/lib/Drupal/Component/PhpStorage/FileStorage.php index 95165a5f545085e834ab5e306884938c6b4b5398..704ae0067224ed309a08217dd9a6805dede19531 100644 --- a/core/lib/Drupal/Component/PhpStorage/FileStorage.php +++ b/core/lib/Drupal/Component/PhpStorage/FileStorage.php @@ -55,28 +55,6 @@ public function save($name, $code) { return (bool) file_put_contents($path, $code); } - /** - * Returns the standard .htaccess lines that Drupal writes to file directories. - * - * @param bool $private - * (optional) Set to FALSE to return the .htaccess lines for an open and - * public directory. The default is TRUE, which returns the .htaccess lines - * for a private and protected directory. - * - * @return string - * The desired contents of the .htaccess file. - * - * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Instead use - * \Drupal\Component\FileSecurity\FileSecurity. - * - * @see https://www.drupal.org/node/3075098 - * @see \Drupal\Component\FileSecurity\FileSecurity::writeHtaccess() - */ - public static function htaccessLines($private = TRUE) { - @trigger_error("htaccessLines() is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use \Drupal\Component\FileSecurity\FileSecurity::htaccessLines() instead. See https://www.drupal.org/node/3075098", E_USER_DEPRECATED); - return FileSecurity::htaccessLines($private); - } - /** * Ensures the directory exists, has the right permissions, and a .htaccess. * diff --git a/core/lib/Drupal/Component/Version/Constraint.php b/core/lib/Drupal/Component/Version/Constraint.php index d7b98e459253b3017b79a66aa61afea46fef63c0..36a53eabb72e321c2bbbec9de963ce36f7ce9d53 100644 --- a/core/lib/Drupal/Component/Version/Constraint.php +++ b/core/lib/Drupal/Component/Version/Constraint.php @@ -51,26 +51,6 @@ public function __toString() { return $this->constraint; } - /** - * A list of associative arrays representing the constraint. - * - * Each containing the keys: - * - 'op': can be one of: '=', '==', '!=', '<>', '<', '<=', '>', or '>='. - * - 'version': A complete version, e.g. '4.5-beta3'. - * - * @return array[] - * The constraint represented as an array. - * - * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. - * Only exists to provide a backwards compatibility layer. - * - * @see https://www.drupal.org/node/2756875 - */ - public function toArray() { - @trigger_error(sprintf('%s() only exists to provide a backwards compatibility layer. See https://www.drupal.org/node/2756875', __METHOD__), E_USER_DEPRECATED); - return $this->constraintArray; - } - /** * Determines if the provided version is satisfied by this constraint. * diff --git a/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageDeprecationTest.php b/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageDeprecationTest.php deleted file mode 100644 index 7ca8c51955074399227fccf263427971736143e1..0000000000000000000000000000000000000000 --- a/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageDeprecationTest.php +++ /dev/null @@ -1,25 +0,0 @@ -<?php - -namespace Drupal\Tests\Component\PhpStorage; - -use Drupal\Component\PhpStorage\FileStorage; -use PHPUnit\Framework\TestCase; - -/** - * Tests FileStorage deprecations. - * - * @coversDefaultClass \Drupal\Component\PhpStorage\FileStorage - * @group legacy - * @group Drupal - * @group PhpStorage - */ -class FileStorageDeprecationTest extends TestCase { - - /** - * @expectedDeprecation htaccessLines() is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use \Drupal\Component\FileSecurity\FileSecurity::htaccessLines() instead. See https://www.drupal.org/node/3075098 - */ - public function testHtAccessLines() { - $this->assertNotEmpty(FileStorage::htaccessLines()); - } - -} diff --git a/core/tests/Drupal/Tests/Component/Version/ConstraintTest.php b/core/tests/Drupal/Tests/Component/Version/ConstraintTest.php index b006113e342c7f0c69d714d90570f60f93f8f59d..292fd123e654b9bf28392aaee8dff0e64f4f7fe2 100644 --- a/core/tests/Drupal/Tests/Component/Version/ConstraintTest.php +++ b/core/tests/Drupal/Tests/Component/Version/ConstraintTest.php @@ -149,19 +149,6 @@ public function providerIsCompatible() { return $tests; } - /** - * @covers ::toArray - * @group legacy - * @expectedDeprecation Drupal\Component\Version\Constraint::toArray() only exists to provide a backwards compatibility layer. See https://www.drupal.org/node/2756875 - */ - public function testToArray() { - $constraint = new Constraint('<8.x-4.x,>8.x-1.x', '8.x'); - $this->assertSame([ - ['op' => '<', 'version' => '4.x'], - ['op' => '>', 'version' => '2.x'], - ], $constraint->toArray()); - } - /** * Create testIsCompatible() test cases for constraints and versions. *