Issue #6 Guaranteed parameter order for test regardless of what filesystem provides

Author: lucasvanlierop

tests/library/EngineBlock/Test/Corto/Module/BindingsTest.php

@@ -36,7 +36,7 @@ public function testResponseRedirectIsNotSupported()
      * @param string $xmlFile
      * @param string $certificateFile
      *
-     * @dataProvider responseFilePathsProvider
+     * @dataProvider responseProvider
      */
     public function testInvalidNameId($xmlFile, $certificateFile)
     {
@@ -47,12 +47,6 @@ public function testInvalidNameId($xmlFile, $certificateFile)
 
         $publicCertificate = file_get_contents($certificateFile);
 
-        // tmp fix, please correct the contents of the pem files with the results of this method
-        if (!strstr($publicCertificate, 'CERTIFICATE')) {
-            $publicCertificate = EngineBlock_X509Certificate::getPublicPemCertFromCertData($publicCertificate);
-            echo "Please correct the contents of '{$certificateFile}'  files with '{$publicCertificate}'";
-        }
-
         $publicKey = openssl_pkey_get_public($publicCertificate);
 
         if (isset($element['ds:Signature'])) {
@@ -77,27 +71,29 @@ public function testInvalidNameId($xmlFile, $certificateFile)
     }
 
     /**
-     * Provides a list of paths to response xml files
+     * Provides a list of paths to response xml files and certificate files
      * 
      * @return array
      */
-    public function responseFilePathsProvider()
+    public function responseProvider()
     {
         $responseFiles = array();
+        $certificateFiles = array();
         $responsesDir = new DirectoryIterator(TEST_RESOURCES_DIR . '/saml/responses');
         /** @var $responseFile DirectoryIterator */
         foreach($responsesDir as $responseFile) {
             if ($responseFile->isFile() && !$responseFile->isDot()) {
                 $extension = substr($responseFile->getFilename(), -3);
                 $fileNameWithoutExtension = substr($responseFile->getFilename(), 0, -4);
-                    $responseFiles[$fileNameWithoutExtension]['certificateFile'] = $responseFile->getRealPath();
+
                 if ($extension == 'cer') {
+                    $certificateFiles[$fileNameWithoutExtension] = $responseFile->getRealPath();
                 } elseif ($extension == 'xml') {
-                    $responseFiles[$fileNameWithoutExtension]['responseXmlFile'] = $responseFile->getRealPath();
+                    $responseFiles[$fileNameWithoutExtension] = $responseFile->getRealPath();
                 }
             }
         }
 
-        return $responseFiles;
+        return array_merge_recursive($responseFiles, $certificateFiles);
     }
 }