Merge branch 'j4test_updates2' of github.com:Hackwar/joomla-cms into …

…j4test_integration

# Conflicts:
#	composer.lock

tests/Unit/Libraries/Cms/Console/Loader/WritableContainerLoaderTest.php

@@ -30,7 +30,7 @@ class WritableContainerLoaderTest extends UnitTestCase
 	 *
 	 * @return  void
 	 */
-	protected function setUp()
+	protected function setUp():void
 	{
 		$this->container = $this->createMock(ContainerInterface::class);
 	}
@@ -76,14 +76,13 @@ public function testTheLoaderRetrievesACommand()
 		);
 	}
 
-	/**
-	 * @expectedException  \Symfony\Component\Console\Exception\CommandNotFoundException
-	 */
 	public function testTheLoaderDoesNotRetrieveAnUnknownCommand()
 	{
 		$commandName = 'test:loader';
 		$serviceId   = 'test.loader';
 
+		$this->expectException(\Symfony\Component\Console\Exception\CommandNotFoundException::class);
+
 		$this->container->expects($this->once())
 			->method('has')
 			->with($serviceId)

tests/Unit/Libraries/Cms/Environment/BrowserTest.php

@@ -36,7 +36,7 @@ class BrowserTest extends UnitTestCase
 	 *
 	 * @return  void
 	 */
-	protected function setUp()
+	protected function setUp():void
 	{
 		$this->browser = new Browser;
 
@@ -48,7 +48,7 @@ protected function setUp()
 	 *
 	 * @return  void
 	 */
-	protected function tearDown()
+	protected function tearDown():void
 	{
 		unset($this->browser);
 

tests/Unit/Libraries/Cms/Feed/FeedEntryTest.php

@@ -38,7 +38,7 @@ class FeedEntryTest extends UnitTestCase
 	 * @see     \PHPUnit\Framework\TestCase::setUp()
 	 * @since   3.1.4
 	 */
-	protected function setUp()
+	protected function setUp():void
 	{
 		parent::setUp();
 
@@ -53,7 +53,7 @@ protected function setUp()
 	 * @see     \PHPUnit\Framework\TestCase::tearDown()
 	 * @since   3.1.4
 	 */
-	protected function tearDown()
+	protected function tearDown():void
 	{
 		unset($this->feedEntry);
 
@@ -141,11 +141,11 @@ public function testSetAuthorWithPerson()
 	 *
 	 * @return  void
 	 *
-	 * @expectedException  InvalidArgumentException
 	 * @since              3.1.4
 	 */
 	public function testSetAuthorWithInvalidAuthor()
 	{
+		$this->expectException(InvalidArgumentException::class);
 		$this->feedEntry->author = 'Jack Sprat';
 	}
 
@@ -154,11 +154,11 @@ public function testSetAuthorWithInvalidAuthor()
 	 *
 	 * @return  void
 	 *
-	 * @expectedException  InvalidArgumentException
 	 * @since              3.1.4
 	 */
 	public function testSetSourceWithInvalidSource()
 	{
+		$this->expectException(InvalidArgumentException::class);
 		$this->feedEntry->source = 'Outer Space';
 	}
 
@@ -167,11 +167,11 @@ public function testSetSourceWithInvalidSource()
 	 *
 	 * @return  void
 	 *
-	 * @expectedException  InvalidArgumentException
 	 * @since              3.1.4
 	 */
 	public function testSetCategoriesWithInvalidProperty()
 	{
+		$this->expectException(InvalidArgumentException::class);
 		$this->feedEntry->categories = 'Can\'t touch this';
 	}
 

tests/Unit/Libraries/Cms/Feed/FeedFactoryTest.php

@@ -32,7 +32,7 @@ class FeedFactoryTest extends UnitTestCase
 	/**
 	 * Setup the tests.
 	 */
-	protected function setUp()
+	protected function setUp():void
 	{
 		parent::setUp();
 
@@ -42,7 +42,7 @@ protected function setUp()
 	/**
 	 * Method to tear down whatever was set up before the test.
 	 */
-	protected function tearDown()
+	protected function tearDown():void
 	{
 		unset($this->feedFactory);
 
@@ -86,21 +86,19 @@ public function testRegisterParser()
 
 	/**
 	 * Tests FeedFactory::registerParser()
-	 *
-	 * @expectedException  InvalidArgumentException
 	 */
 	public function testRegisterParserWithInvalidClass()
 	{
+		$this->expectException(InvalidArgumentException::class);
 		$this->feedFactory->registerParser('does-not-exist', 'NotExistingClass');
 	}
 
 	/**
 	 * Tests FeedFactory::registerParser()
-	 *
-	 * @expectedException  InvalidArgumentException
 	 */
 	public function testRegisterParserWithInvalidTag()
 	{
+		$this->expectException(InvalidArgumentException::class);
 		$parseMock = $this->createMock(FeedParser::class);
 		$this->feedFactory->registerParser('42tag', get_class($parseMock));
 	}
@@ -127,11 +125,10 @@ public function testFetchFeedParser()
 
 	/**
 	 * Tests FeedFactory::_fetchFeedParser()
-	 *
-	 * @expectedException  LogicException
 	 */
 	public function testFetchFeedParserWithInvalidTag()
 	{
+		$this->expectException(\LogicException::class);
 		$xmlReaderMock = $this->createMock(XMLReader::class);
 
 		// Use reflection to test private method

tests/Unit/Libraries/Cms/Feed/FeedLinkTest.php

@@ -27,11 +27,11 @@ class FeedLinkTest extends UnitTestCase
 	 *
 	 * @return  void
 	 *
-	 * @expectedException  InvalidArgumentException
 	 * @since              3.1.4
 	 */
 	public function testConstructWithInvalidLength()
 	{
+		$this->expectException(InvalidArgumentException::class);
 		new FeedLink('URI', 'self', 'application/x-pdf', 'en-GB', 'My Link', 'foobar');
 	}
 }

tests/Unit/Libraries/Cms/Feed/FeedParserTest.php

@@ -122,9 +122,9 @@ public function testParseDetectsUnregisteredNamespace()
 		$parser = new FeedParserStub($xmlReader);
 		$parser->parse();
 
-		$this->assertAttributeNotEmpty( 'namespaces', $parser);
-		$this->assertArrayHasKey($prefix, static::readAttribute($parser, 'namespaces'));
-		$this->assertInstanceOf(FeedParserStubUnregistered::class, static::readAttribute($parser, 'namespaces')[$prefix]);
+		$this->assertNotEmpty($parser->getNamespaces());
+		$this->assertArrayHasKey($prefix, $parser->getNamespaces());
+		$this->assertInstanceOf(FeedParserStubUnregistered::class, $parser->getNamespaces()[$prefix]);
 
 		// Cleanup
 		$xmlReader->close();
@@ -201,7 +201,7 @@ public function testRegisterNamespace()
 		$returnedParser = $parser->registerNamespace($prefix, $namespaceMock);
 
 		$this->assertInstanceOf(FeedParserStub::class, $returnedParser);
-		$this->assertAttributeEquals([$prefix => $namespaceMock], 'namespaces', $parser);
+		$this->assertEquals([$prefix => $namespaceMock], $parser->getNamespaces());
 	}
 
 	/**
@@ -445,6 +445,18 @@ public function getHandleCustomCalledWith(): array
 		return $this->handleCustomCalledWith;
 	}
 
+	/**
+	 * Getter for the namespaces
+	 *
+	 * @return  array
+	 *
+	 * @since   4.0
+	 */
+	public function getNamespaces(): array
+	{
+		return $this->namespaces;
+	}
+
 	/**
 	 * Getter for the handle custom called with flag
 	 *

tests/Unit/Libraries/Cms/Feed/FeedTest.php

@@ -38,7 +38,7 @@ class FeedTest extends UnitTestCase
 	 *
 	 * @since   3.1.4
 	 */
-	protected function setUp()
+	protected function setUp():void
 	{
 		parent::setUp();
 
@@ -52,7 +52,7 @@ protected function setUp()
 	 *
 	 * @since   3.1.4
 	 */
-	protected function tearDown()
+	protected function tearDown():void
 	{
 		unset($this->feed);
 
@@ -176,11 +176,11 @@ public function testSetAuthorWithPerson()
 	 *
 	 * @return  void
 	 *
-	 * @expectedException  InvalidArgumentException
 	 * @since              3.1.4
 	 */
 	public function testSetAuthorWithInvalidAuthor()
 	{
+		$this->expectException(InvalidArgumentException::class);
 		$this->feed->author = 'Jack Sprat';
 	}
 
@@ -189,11 +189,11 @@ public function testSetAuthorWithInvalidAuthor()
 	 *
 	 * @return  void
 	 *
-	 * @expectedException  InvalidArgumentException
 	 * @since              3.1.4
 	 */
 	public function testSetCategoriesWithInvalidProperty()
 	{
+		$this->expectException(InvalidArgumentException::class);
 		$this->feed->categories = 'Can\'t touch this';
 	}
 
@@ -202,11 +202,11 @@ public function testSetCategoriesWithInvalidProperty()
 	 *
 	 * @return  void
 	 *
-	 * @expectedException  InvalidArgumentException
 	 * @since              3.1.4
 	 */
 	public function testSetContributorsWithInvalidProperty()
 	{
+		$this->expectException(InvalidArgumentException::class);
 		$this->feed->contributors = 'Can\'t touch this';
 	}
 
@@ -436,11 +436,11 @@ public function testOffsetGet()
 	 *
 	 * @return  void
 	 *
-	 * @expectedException  InvalidArgumentException
 	 * @since              3.1.4
 	 */
 	public function testOffsetSetWithString()
 	{
+		$this->expectException(InvalidArgumentException::class);
 		$this->feed->offsetSet(1, 'My string');
 	}
 

tests/Unit/Libraries/Cms/Feed/Parser/AtomParserTest.php

@@ -324,8 +324,10 @@ public function testInitialiseSetsDefaultVersion()
 		$method = $reflectionClass->getMethod('initialise');
 		$method->setAccessible(true);
 		$method->invoke($atomParser);
+		$attribute = $reflectionClass->getProperty('version');
+		$attribute->setAccessible(true);
 
-		$this->assertAttributeEquals('1.0', 'version', $atomParser);
+		$this->assertEquals('1.0', $attribute->getValue($atomParser));
 	}
 
 	/**
@@ -348,8 +350,10 @@ public function testInitialiseSetsOldVersion()
 		$method = $reflectionClass->getMethod('initialise');
 		$method->setAccessible(true);
 		$method->invoke($atomParser);
+		$attribute = $reflectionClass->getProperty('version');
+		$attribute->setAccessible(true);
 
-		$this->assertAttributeEquals('0.3', 'version', $atomParser);
+		$this->assertEquals('0.3', $attribute->getValue($atomParser));
 	}
 
 	/**

tests/Unit/Libraries/Cms/Feed/Parser/RssParserTest.php

@@ -559,8 +559,10 @@ public function testInitialiseSetsVersion()
 		$method = $reflectionClass->getMethod('initialise');
 		$method->setAccessible(true);
 		$method->invoke($rssParser);
+		$attribute = $reflectionClass->getProperty('version');
+		$attribute->setAccessible(true);
 
-		$this->assertAttributeEquals($version, 'version', $rssParser);
+		$this->assertEquals($version, $attribute->getValue($rssParser));
 	}
 
 	/**

tests/Unit/Libraries/Cms/Layout/BaseLayoutTest.php

@@ -24,7 +24,7 @@ class BaseLayoutTest extends UnitTestCase
 	 * Sets up the test by instantiating BaseLayout
 	 * This method is called before a test is executed.
 	 */
-	protected function setUp()
+	protected function setUp():void
 	{
 		$this->baseLayout = new BaseLayout;
 
@@ -34,7 +34,7 @@ protected function setUp()
 	/**
 	 * This method is called after a test is executed.
 	 */
-	protected function tearDown()
+	protected function tearDown():void
 	{
 		unset($this->baseLayout);
 
@@ -185,7 +185,7 @@ public function testAddDebugMessageToTheQueue()
 	 */
 	public function testRetrievingTheListOfDebugMessagesIsAnArray()
 	{
-		$this->assertInternalType('array', $this->baseLayout->getDebugMessages());
+		$this->assertIsArray($this->baseLayout->getDebugMessages());
 	}
 
 	/**

tests/Unit/Libraries/Cms/Mail/MailTest.php

@@ -33,7 +33,7 @@ class MailTest extends UnitTestCase
 	 *
 	 * @return void
 	 */
-	protected function setUp()
+	protected function setUp():void
 	{
 		parent::setUp();
 
@@ -45,7 +45,7 @@ protected function setUp()
 	 *
 	 * @return void
 	 */
-	protected function tearDown()
+	protected function tearDown():void
 	{
 		unset($this->mail);
 

tests/Unit/Libraries/Cms/Object/CMSObjectTest.php

@@ -167,11 +167,7 @@ public function testGetErrors()
 		{
 			$object->setError($error);
 		}
-		$this->assertAttributeEquals(
-			$object->getErrors(),
-			'_errors',
-			$object
-		);
+
 		$this->assertEquals(
 			$errors,
 			$object->getErrors(),
@@ -225,10 +221,9 @@ public function testSetError()
 	{
 		$object = new CMSObject;
 		$object->setError('A Test Error');
-		$this->assertAttributeEquals(
+		$this->assertEquals(
 			array('A Test Error'),
-			'_errors',
-			$object
+			$object->getErrors()
 		);
 	}
 }

tests/Unit/Libraries/Cms/Toolbar/ToolbarTest.php

@@ -174,11 +174,9 @@ public function testRenderButton()
 		$this->assertEquals($renderedButton, $toolbar->renderButton($button));
 	}
 
-	/**
-	 * @expectedException \UnexpectedValueException
-	 */
 	public function testRenderButtonThrowsUnexpectedValueException()
 	{
+		$this->expectException(\UnexpectedValueException::class);
 		$button     = ['Separator', 'spacer'];
 		$toolbarFactoryMock = $this->createMock(ToolbarFactoryInterface::class);
 		$toolbarFactoryMock