X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fmedia%2FXMPValidate.php;h=fe47f4740e79c93559b9a591eb2b11241f5d9235;hb=734ca2b4d2a1246fb0ea1e54b861ab423ab5e257;hp=519c420cd360a3472dd98678749890a9107e8a85;hpb=19d5f55c010356ba1b29696bc566f1fc902fef4a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/media/XMPValidate.php b/includes/media/XMPValidate.php
index 519c420cd3..fe47f4740e 100644
--- a/includes/media/XMPValidate.php
+++ b/includes/media/XMPValidate.php
@@ -70,7 +70,7 @@ class XMPValidate implements LoggerAwareInterface {
 			return;
 		}
 		if ( $val !== 'True' && $val !== 'False' ) {
-			$this->debug->info( __METHOD__ . " Expected True or False but got $val" );
+			$this->logger->info( __METHOD__ . " Expected True or False but got $val" );
 			$val = null;
 		}
 	}
@@ -218,8 +218,9 @@ class XMPValidate implements LoggerAwareInterface {
 	 *
 	 * This is just a naive check to make sure it somewhat looks like a lang code.
 	 *
-	 * @see rfc 3066
-	 * @see http://www.adobe.com/devnet/xmp/pdfs/XMPSpecificationPart1.pdf page 30 (section 8.2.2.5)
+	 * @see BCP 47
+	 * @see https://wwwimages2.adobe.com/content/dam/Adobe/en/devnet/xmp/pdfs/
+	 *      XMP%20SDK%20Release%20cc-2014-12/XMPSpecificationPart1.pdf page 22 (section 8.2.2.4)
 	 *
 	 * @param array $info Information about current property
 	 * @param mixed &$val Current value to validate
@@ -259,7 +260,7 @@ class XMPValidate implements LoggerAwareInterface {
 			// this only validates standalone properties, not arrays, etc
 			return;
 		}
-		$res = array();
+		$res = [];
 		// @codingStandardsIgnoreStart Long line that cannot be broken
 		if ( !preg_match(
 			/* ahh! scary regex... */
@@ -360,7 +361,7 @@ class XMPValidate implements LoggerAwareInterface {
 			return;
 		}
 
-		$m = array();
+		$m = [];
 		if ( preg_match(
 			'/(\d{1,3}),(\d{1,2}),(\d{1,2})([NWSE])/D',
 			$val, $m )