jderusse
diff --git a/‎swiftmailer/2014-06-13.yaml renamed to ‎swiftmailer/swiftmailer/2014-06-13.yaml b/‎swiftmailer/2014-06-13.yaml renamed to ‎swiftmailer/swiftmailer/2014-06-13.yaml
diff --git a/‎validator.php
Lines changed: 11 additions & 3 deletions b/‎validator.php
Lines changed: 11 additions & 3 deletions
diff --git a/‎zendframework/zend-validator/ZF2015-03.yaml
Lines changed: 1 addition & 1 deletion b/‎zendframework/zend-validator/ZF2015-03.yaml
Lines changed: 1 addition & 1 deletion
diff --git a/‎zf-fr/zfr-oauth2-server-module/2014-04-26.yaml renamed to ‎zfr/zfr-oauth2-server-module/2014-04-26.yaml b/‎zf-fr/zfr-oauth2-server-module/2014-04-26.yaml renamed to ‎zfr/zfr-oauth2-server-module/2014-04-26.yaml
@@ -39,7 +39,7 @@
         continue;
     }
 
-    $path = str_replace(__DIR__.'/', '', $file->getPathname());
+    $path = str_replace(__DIR__.DIRECTORY_SEPARATOR, '', $file->getPathname());
 
     if ('yaml' !== $file->getExtension()) {
         $messages[$path][] = 'The file extension should be ".yaml".';
@@ -63,8 +63,16 @@
             }
         }
 
-        if (isset($data['reference']) && 0 !== strpos($data['reference'], 'composer://')) {
-            $messages[$path][] = 'Reference must start with "composer://"';
+        if (isset($data['reference'])) {
+            if (0 !== strpos($data['reference'], 'composer://')) {
+                $messages[$path][] = 'Reference must start with "composer://"';
+            } else {
+                $composerPackage = substr($data['reference'], 11);
+
+                if (str_replace(DIRECTORY_SEPARATOR, '/', dirname($path)) !== $composerPackage) {
+                    $messages[$path][] = 'Reference composer package must match the folder name';
+                }
+            }
         }
 
         if (!isset($data['branches'])) {
 
@@ -5,4 +5,4 @@ branches:
     2.3.x:
         time:     2015-03-12 13:58:47
         versions: [>=2.3.0,<2.3.6]
-reference: composer://zendframework/validator
+reference: composer://zendframework/zend-validator
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`continue;`
`40`	`40`	`}`
`41`	`41`
`42`		`- $path = str_replace(__DIR__.'/', '', $file->getPathname());`
	`42`	`+ $path = str_replace(__DIR__.DIRECTORY_SEPARATOR, '', $file->getPathname());`
`43`	`43`
`44`	`44`	`if ('yaml' !== $file->getExtension()) {`
`45`	`45`	`$messages[$path][] = 'The file extension should be ".yaml".';`
`@@ -63,8 +63,16 @@`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
`66`		`- if (isset($data['reference']) && 0 !== strpos($data['reference'], 'composer://')) {`
`67`		`- $messages[$path][] = 'Reference must start with "composer://"';`
	`66`	`+ if (isset($data['reference'])) {`
	`67`	`+ if (0 !== strpos($data['reference'], 'composer://')) {`
	`68`	`+ $messages[$path][] = 'Reference must start with "composer://"';`
	`69`	`+ } else {`
	`70`	`+ $composerPackage = substr($data['reference'], 11);`
	`71`	`+`
	`72`	`+ if (str_replace(DIRECTORY_SEPARATOR, '/', dirname($path)) !== $composerPackage) {`
	`73`	`+ $messages[$path][] = 'Reference composer package must match the folder name';`
	`74`	`+ }`
	`75`	`+ }`
`68`	`76`	`}`
`69`	`77`
`70`	`78`	`if (!isset($data['branches'])) {`