resourceloader: Fix null type docs for FileModule::getPackageFiles

The null check for the class property packageFiles needs change to
check the return value of the function instead, because Phan would
report an issue that a null value is used in the foreach.

Phan does not understand the relation between the return value and the
class property.
When using a local variable then Phan can check
that the value is never null when used.

Change-Id: I48ac8a8fe55ae7b4e13bc94d2f2d2ede01fbc68b

1 files changed, 5 insertions, 5 deletions

diff --git a/includes/resourceloader/ResourceLoaderFileModule.php b/includes/resourceloader/ResourceLoaderFileModule.php
index 7a2c0c105536..80afe3055614 100644
--- a/includes/resourceloader/ResourceLoaderFileModule.php
+++ b/includes/resourceloader/ResourceLoaderFileModule.php
@@ -361,8 +361,8 @@ class ResourceLoaderFileModule extends ResourceLoaderModule {
 	 */
 	public function getScript( ResourceLoaderContext $context ) {
 		$deprecationScript = $this->getDeprecationInformation( $context );
-		if ( $this->packageFiles !== null ) {
-			$packageFiles = $this->getPackageFiles( $context );
+		$packageFiles = $this->getPackageFiles( $context );
+		if ( $packageFiles !== null ) {
 			foreach ( $packageFiles['files'] as &$file ) {
 				if ( $file['type'] === 'script+style' ) {
 					$file['content'] = $file['content']['script'];
@@ -420,8 +420,8 @@ class ResourceLoaderFileModule extends ResourceLoaderModule {
 			$context
 		);
 
-		if ( $this->packageFiles !== null ) {
-			$packageFiles = $this->getPackageFiles( $context );
+		$packageFiles = $this->getPackageFiles( $context );
+		if ( $packageFiles !== null ) {
 			foreach ( $packageFiles['files'] as $fileName => $file ) {
 				if ( $file['type'] === 'script+style' ) {
 					$style = $this->processStyle(
@@ -1355,7 +1355,7 @@ class ResourceLoaderFileModule extends ResourceLoaderModule {
 	/**
 	 * Resolves the package files definition and generates the content of each package file.
 	 * @param ResourceLoaderContext $context
-	 * @return array Package files data structure, see ResourceLoaderModule::getScript()
+	 * @return array|null Package files data structure, see ResourceLoaderModule::getScript()
 	 * @throws RuntimeException If a file doesn't exist, or parsing a .vue file fails
 	 */
 	public function getPackageFiles( ResourceLoaderContext $context ) {