Remove deprecated Article::__get/__set magic functions

Change-Id: If8e8006e88f11848f129ebfb10d5093d492287bb

3 files changed, 1 insertions, 67 deletions

diff --git a/RELEASE-NOTES-1.42 b/RELEASE-NOTES-1.42
index 60c8432d2e88..04ecbd0e3e1a 100644
--- a/RELEASE-NOTES-1.42
+++ b/RELEASE-NOTES-1.42
@@ -182,6 +182,7 @@ because of Phabricator reports.
   - ::run()
   - ::runWithoutAbort()
   - ::runner()
+* Article::__get(), ::__set(), deprecated since 1.35, have been removed.
 * …
 
 === Deprecations in 1.42 ===
diff --git a/includes/page/Article.php b/includes/page/Article.php
index 80d2021da743..0c3f02ee2f47 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1991,48 +1991,6 @@ class Article implements Page {
 	}
 
 	/**
-	 * @deprecated since 1.35, use Article::getPage() instead
-	 *
-	 * Use PHP's magic __get handler to handle accessing of
-	 * raw WikiPage fields for backwards compatibility
-	 *
-	 * @param string $fname Field name
-	 * @return mixed
-	 */
-	public function __get( $fname ) {
-		wfDeprecatedMsg( "Accessing Article::\$$fname is deprecated since MediaWiki 1.35",
-			'1.35' );
-
-		if ( property_exists( $this->mPage, $fname ) ) {
-			return $this->mPage->$fname;
-		}
-		trigger_error( 'Inaccessible property via __get(): ' . $fname, E_USER_NOTICE );
-	}
-
-	/**
-	 * @deprecated since 1.35, use Article::getPage() instead
-	 *
-	 * Use PHP's magic __set handler to handle setting of
-	 * raw WikiPage fields for backwards compatibility
-	 *
-	 * @param string $fname Field name
-	 * @param mixed $fvalue New value
-	 */
-	public function __set( $fname, $fvalue ) {
-		wfDeprecatedMsg( "Setting Article::\$$fname is deprecated since MediaWiki 1.35",
-			'1.35' );
-
-		if ( property_exists( $this->mPage, $fname ) ) {
-			$this->mPage->$fname = $fvalue;
-		// Note: extensions may want to toss on new fields
-		} elseif ( !in_array( $fname, [ 'mContext', 'mPage' ] ) ) {
-			$this->mPage->$fname = $fvalue;
-		} else {
-			trigger_error( 'Inaccessible property via __set(): ' . $fname, E_USER_NOTICE );
-		}
-	}
-
-	/**
 	 * Call to WikiPage function for backwards compatibility.
 	 * @see ContentHandler::getActionOverrides
 	 * @return array
diff --git a/tests/phpunit/includes/page/ArticleTest.php b/tests/phpunit/includes/page/ArticleTest.php
index 00299d4d8de0..e8a7d82c4442 100644
--- a/tests/phpunit/includes/page/ArticleTest.php
+++ b/tests/phpunit/includes/page/ArticleTest.php
@@ -34,31 +34,6 @@ class ArticleTest extends \MediaWikiIntegrationTestCase {
 	}
 
 	/**
-	 * @covers Article::__get
-	 * @covers Article::__set
-	 */
-	public function testGetOrSetOnNewProperty() {
-		$article = new Article( Title::newMainPage() );
-
-		$this->filterDeprecated(
-			'/Accessing Article::\$ext_someNewProperty/'
-		);
-		$this->filterDeprecated(
-			'/Setting Article::\$ext_someNewProperty/'
-		);
-		$article->ext_someNewProperty = 12;
-		$this->assertEquals( 12, $article->ext_someNewProperty,
-			"Article get/set magic on new field" );
-		$this->assertEquals( 12, $article->getPage()->ext_someNewProperty,
-			"Article get/set magic on new field" );
-		$article->ext_someNewProperty = -8;
-		$this->assertEquals( -8, $article->ext_someNewProperty,
-			"Article get/set magic on update to new field" );
-		$this->assertEquals( -8, $article->getPage()->ext_someNewProperty,
-			"Article get/set magic on new field" );
-	}
-
-	/**
 	 * @covers Article::__sleep
 	 */
 	public function testSerialization_fails() {