X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2FForeignResourceManager.php;h=80a12fe1e64654d9e2d47f0586d3ad4d11caf4f3;hp=9fd1e4fe45b318f969c5a9d78a29f19ee008ef9d;hb=e73328601d51674e8fef89c3db12b30ceafd702f;hpb=c56c68cb67a40801f718a60463be48e4cf5ea9e3 diff --git a/includes/ForeignResourceManager.php b/includes/ForeignResourceManager.php index 9fd1e4fe45..80a12fe1e6 100644 --- a/includes/ForeignResourceManager.php +++ b/includes/ForeignResourceManager.php @@ -19,6 +19,8 @@ * @ingroup Maintenance */ +use Wikimedia\AtEase\AtEase; + /** * Manage foreign resources registered with ResourceLoader. * @@ -150,7 +152,7 @@ class ForeignResourceManager { /** @return string|false */ private function cacheGet( $key ) { - return Wikimedia\quietCall( 'file_get_contents', "{$this->cacheDir}/$key.data" ); + return AtEase::quietCall( 'file_get_contents', "{$this->cacheDir}/$key.data" ); } private function cacheSet( $key, $data ) { @@ -178,15 +180,13 @@ class ForeignResourceManager { if ( $integrity === $actualIntegrity ) { $this->verbose( "... passed integrity check for {$src}\n" ); $this->cacheSet( $key, $data ); + } elseif ( $this->action === 'make-sri' ) { + $this->output( "Integrity for {$src}\n\tintegrity: ${actualIntegrity}\n" ); } else { - if ( $this->action === 'make-sri' ) { - $this->output( "Integrity for {$src}\n\tintegrity: ${actualIntegrity}\n" ); - } else { - throw new Exception( "Integrity check failed for {$src}\n" . - "\tExpected: {$integrity}\n" . - "\tActual: {$actualIntegrity}" - ); - } + throw new Exception( "Integrity check failed for {$src}\n" . + "\tExpected: {$integrity}\n" . + "\tActual: {$actualIntegrity}" + ); } return $data; }