From 1bb9cb5d871f41ace9f7d774fd0cc7f7bf6f1421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Unger?= Date: Thu, 7 Jul 2016 15:03:56 +0200 Subject: [PATCH] wip --- .coveralls.yml | 1 - .gitignore | 1 - composer.json | 1 + src/Server/Server.php | 2 +- tests/U2f/Server/RegisterRequestTest.php | 4 +- .../U2f/Server/RegistrationCollectionTest.php | 6 +-- tests/U2f/Server/ServerTest.php | 42 +++++++++---------- .../U2f/Server/SignRequestCollectionTest.php | 6 +-- 8 files changed, 31 insertions(+), 32 deletions(-) diff --git a/.coveralls.yml b/.coveralls.yml index 2dc2afd..c512a3d 100644 --- a/.coveralls.yml +++ b/.coveralls.yml @@ -1,4 +1,3 @@ service_name: travis-ci -src_dir: src coverage_clover: coverage.xml json_path: coverage.json diff --git a/.gitignore b/.gitignore index a35ab53..0bfe817 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -tests/tmp/* vendor/* composer.lock diff --git a/composer.json b/composer.json index 18a0ab7..e6969e7 100644 --- a/composer.json +++ b/composer.json @@ -12,6 +12,7 @@ ], "require": { "php": ">=7.0", + "ext-openssl": "*", "nette/finder": "^2.4", "nette/utils": "^2.4" }, diff --git a/src/Server/Server.php b/src/Server/Server.php index 4f71120..bce0ec0 100644 --- a/src/Server/Server.php +++ b/src/Server/Server.php @@ -74,7 +74,7 @@ public function register(RegisterRequest $request, RegisterResponse $response) */ public function createSignRequests(RegistrationCollection $registrations) { - $requests = new SignRequestCollection; + $requests = new SignRequestCollection(); foreach ($registrations as $registration) { $requests->add(new SignRequest( $this->config->getVersion(), diff --git a/tests/U2f/Server/RegisterRequestTest.php b/tests/U2f/Server/RegisterRequestTest.php index 6ba0515..b6b3b24 100644 --- a/tests/U2f/Server/RegisterRequestTest.php +++ b/tests/U2f/Server/RegisterRequestTest.php @@ -11,7 +11,7 @@ class RegisterRequestTest extends \PHPUnit_Framework_TestCase public function testGetSet() { - $signRequests = (new SignRequestCollection)->add(new SignRequest('d', 'e', 'f', 'g')); + $signRequests = (new SignRequestCollection())->add(new SignRequest('d', 'e', 'f', 'g')); $request = new RegisterRequest('a', 'b', 'c', $signRequests); $this->assertSame('a', $request->getVersion()); $this->assertSame('b', $request->getAppId()); @@ -24,7 +24,7 @@ public function testJsonSerializable() { $this->assertSame( '{"version":"a","challenge":"Yw","appId":"b"}', - json_encode(new RegisterRequest('a', 'b', 'c', (new SignRequestCollection)->add(new SignRequest('d', 'e', 'f', 'f')))) + json_encode(new RegisterRequest('a', 'b', 'c', (new SignRequestCollection())->add(new SignRequest('d', 'e', 'f', 'f')))) ); } diff --git a/tests/U2f/Server/RegistrationCollectionTest.php b/tests/U2f/Server/RegistrationCollectionTest.php index d91fb9f..ccf6993 100644 --- a/tests/U2f/Server/RegistrationCollectionTest.php +++ b/tests/U2f/Server/RegistrationCollectionTest.php @@ -12,7 +12,7 @@ class RegistrationCollectionTest extends \PHPUnit_Framework_TestCase public function testGetSet() { - $registrations = new RegistrationCollection; + $registrations = new RegistrationCollection(); $registrations->add(new Registration($this->getPublicKey(), 'a', 'b')); $registrations->add(new Registration($this->getPublicKey(), 'c', 'd')); $this->assertCount(2, $registrations); @@ -21,7 +21,7 @@ public function testGetSet() public function testGetMatchingRegistration() { - $registrations = new RegistrationCollection; + $registrations = new RegistrationCollection(); $registrations->add($registration = new Registration($this->getPublicKey(), 'a', 'b')); $this->assertSame($registration, $registrations->getMatchingRegistration(new SignResponse('a', 'abcdef', '{"challenge":"c"}'))); @@ -33,7 +33,7 @@ public function testGetMatchingRegistration() */ public function testNoMatchingRegistration() { - $registrations = new RegistrationCollection; + $registrations = new RegistrationCollection(); $registrations->add($registration = new Registration($this->getPublicKey(), 'a', 'b')); $registrations->getMatchingRegistration(new SignResponse('g', 'abcdef', '{"challenge":"c"}')); diff --git a/tests/U2f/Server/ServerTest.php b/tests/U2f/Server/ServerTest.php index 44c2fbd..8a2bc3d 100644 --- a/tests/U2f/Server/ServerTest.php +++ b/tests/U2f/Server/ServerTest.php @@ -19,7 +19,7 @@ class ServerTest extends \PHPUnit_Framework_TestCase public function testCreateRegisterRequest() { $server = new Server(new Config('a')); - $registrations = (new RegistrationCollection)->add(new Registration($this->getPublicKey(), 'b', 'c')); + $registrations = (new RegistrationCollection())->add(new Registration($this->getPublicKey(), 'b', 'c')); $request = $server->createRegisterRequest($registrations); $this->assertInstanceOf(RegisterRequest::class, $request); @@ -39,7 +39,7 @@ public function testCreateRegisterRequest() public function testCreateSignRequests() { $server = new Server(new Config('a')); - $registrations = new RegistrationCollection; + $registrations = new RegistrationCollection(); $registrations->add(new Registration($this->getPublicKey(), 'b', 'c')); $registrations->add(new Registration($this->getPublicKey(), 'd', 'e')); @@ -71,7 +71,7 @@ public function testRegister() $config->getVersion(), $config->getAppId(), Helpers::urlSafeBase64Decode('yKA0x075tjJ-GE7fKTfnzTOSaNUOWQxRd9TWz5aFOg8'), - new SignRequestCollection + new SignRequestCollection() ), new RegisterResponse( Helpers::urlSafeBase64Decode('BQQtEmhWVgvbh-8GpjsHbj_d5FB9iNoRL8mNEq34-ANufKWUpVdIj6BSB_m3eMoZ3GqnaDy3RA5eWP8mhTkT1Ht3QAk1GsmaPIQgXgvrBkCQoQtMFvmwYPfW5jpRgoMPFxquHS7MTt8lofZkWAK2caHD-YQQdaRBgd22yWIjPuWnHOcwggLiMIHLAgEBMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBDQTAeFw0xNDA1MTUxMjU4NTRaFw0xNDA2MTQxMjU4NTRaMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBFRTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNsK2_Uhx1zOY9ym4eglBg2U5idUGU-dJK8mGr6tmUQflaNxkQo6IOc-kV4T6L44BXrVeqN-dpCPr-KKlLYw650wDQYJKoZIhvcNAQELBQADggIBAJVAa1Bhfa2Eo7TriA_jMA8togoA2SUE7nL6Z99YUQ8LRwKcPkEpSpOsKYWJLaR6gTIoV3EB76hCiBaWN5HV3-CPyTyNsM2JcILsedPGeHMpMuWrbL1Wn9VFkc7B3Y1k3OmcH1480q9RpYIYr-A35zKedgV3AnvmJKAxVhv9GcVx0_CewHMFTryFuFOe78W8nFajutknarupekDXR4tVcmvj_ihJcST0j_Qggeo4_3wKT98CgjmBgjvKCd3Kqg8n9aSDVWyaOZsVOhZj3Fv5rFu895--D4qiPDETozJIyliH-HugoQpqYJaTX10mnmMdCa6aQeW9CEf-5QmbIP0S4uZAf7pKYTNmDQ5z27DVopqaFw00MIVqQkae_zSPX4dsNeeoTTXrwUGqitLaGap5ol81LKD9JdP3nSUYLfq0vLsHNDyNgb306TfbOenRRVsgQS8tJyLcknSKktWD_Qn7E5vjOXprXPrmdp7g5OPvrbz9QkWa1JTRfo2n2AXV02LPFc-UfR9bWCBEIJBxvmbpmqt0MnBTHWnth2b0CU_KJTDCY3kAPLGbOT8A4KiI73pRW-e9SWTaQXskw3Ei_dHRILM_l9OXsqoYHJ4Dd3tbfvmjoNYggSw4j50l3unI9d1qR5xlBFpW5sLr8gKX4bnY4SR2nyNiOQNLyPc0B0nW502aMEUCIQDTGOX-i_QrffJDY8XvKbPwMuBVrOSO-ayvTnWs_WSuDQIgZ7fMAvD_Ezyy5jg6fQeuOkoJi8V2naCtzV-HTly8Nww='), @@ -98,7 +98,7 @@ public function testRegisterUnmatchedChallenge() new RegisterRequest( $config->getVersion(), $config->getAppId(), Helpers::urlSafeBase64Decode('yKA0x075tjJ-GE7fKTfnzTOSaNUOWQxRd9TWz5aFOg8'), - new SignRequestCollection + new SignRequestCollection() ), new RegisterResponse( Helpers::urlSafeBase64Decode('BQQtEmhWVgvbh-8GpjsHbj_d5FB9iNoRL8mNEq34-ANufKWUpVdIj6BSB_m3eMoZ3GqnaDy3RA5eWP8mhTkT1Ht3QAk1GsmaPIQgXgvrBkCQoQtMFvmwYPfW5jpRgoMPFxquHS7MTt8lofZkWAK2caHD-YQQdaRBgd22yWIjPuWnHOcwggLiMIHLAgEBMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBDQTAeFw0xNDA1MTUxMjU4NTRaFw0xNDA2MTQxMjU4NTRaMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBFRTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNsK2_Uhx1zOY9ym4eglBg2U5idUGU-dJK8mGr6tmUQflaNxkQo6IOc-kV4T6L44BXrVeqN-dpCPr-KKlLYw650wDQYJKoZIhvcNAQELBQADggIBAJVAa1Bhfa2Eo7TriA_jMA8togoA2SUE7nL6Z99YUQ8LRwKcPkEpSpOsKYWJLaR6gTIoV3EB76hCiBaWN5HV3-CPyTyNsM2JcILsedPGeHMpMuWrbL1Wn9VFkc7B3Y1k3OmcH1480q9RpYIYr-A35zKedgV3AnvmJKAxVhv9GcVx0_CewHMFTryFuFOe78W8nFajutknarupekDXR4tVcmvj_ihJcST0j_Qggeo4_3wKT98CgjmBgjvKCd3Kqg8n9aSDVWyaOZsVOhZj3Fv5rFu895--D4qiPDETozJIyliH-HugoQpqYJaTX10mnmMdCa6aQeW9CEf-5QmbIP0S4uZAf7pKYTNmDQ5z27DVopqaFw00MIVqQkae_zSPX4dsNeeoTTXrwUGqitLaGap5ol81LKD9JdP3nSUYLfq0vLsHNDyNgb306TfbOenRRVsgQS8tJyLcknSKktWD_Qn7E5vjOXprXPrmdp7g5OPvrbz9QkWa1JTRfo2n2AXV02LPFc-UfR9bWCBEIJBxvmbpmqt0MnBTHWnth2b0CU_KJTDCY3kAPLGbOT8A4KiI73pRW-e9SWTaQXskw3Ei_dHRILM_l9OXsqoYHJ4Dd3tbfvmjoNYggSw4j50l3unI9d1qR5xlBFpW5sLr8gKX4bnY4SR2nyNiOQNLyPc0B0nW502aMEUCIQDTGOX-i_QrffJDY8XvKbPwMuBVrOSO-ayvTnWs_WSuDQIgZ7fMAvD_Ezyy5jg6fQeuOkoJi8V2naCtzV-HTly8Nww='), @@ -121,7 +121,7 @@ public function testRegisterFail() $config->getVersion(), $config->getAppId(), Helpers::urlSafeBase64Decode('yKA0x075tjJ-GE7fKTfnzTOSaNUOWQxRd9TWz5aFOg8'), - new SignRequestCollection + new SignRequestCollection() ), new RegisterResponse( Helpers::urlSafeBase64Decode('BQQtEmhWVgvbh-8GpjsHbj_d5FB9iNoRL8mNEq34-ANufKWUpVdIj6BSB_m3eMoZ3GqnaDy3RA5eWP8mhTkT1Ht3QAk1GsmaPIQgXgvrBkCQoQtMFvmwYPfW5jpRgoMPFxquHS7MTt8lofZkWAK2caHD-YQQdaRBgd22yWIjPuWnHOcwggLiMIHLAgEBMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBDQTAeFw0xNDA1MTUxMjU4NTRaFw0xNDA2MTQxMjU4NTRaMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBFRTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNsK2_Uhx1zOY9ym4eglBg2U5idUGU-dJK8mGr6tmUQflaNxkQo6IOc-kV4T6L44BXrVeqN-dpCPr-KKlLYw650wDQYJKoZIhvcNAQELBQADggIBAJVAa1Bhfa2Eo7TriA_jMA8togoA2SUE7nL6Z99YUQ8LRwKcPkEpSpOsKYWJLaR6gTIoV3EB76hCiBaWN5HV3-CPyTyNsM2JcILsedPGeHMpMuWrbL1Wn9VFkc7B3Y1k3OmcH1480q9RpYIYr-A35zKedgV3AnvmJKAxVhv9GcVx0_CewHMFTryFuFOe78W8nFajutknarupekDXR4tVcmvj_ihJcST0j_Qggeo4_3wKT98CgjmBgjvKCd3Kqg8n9aSDVWyaOZsVOhZj3Fv5rFu895--D4qiPDETozJIyliH-HugoQpqYJaTX10mnmMdCa6aQeW9CEf-5QmbIP0S4uZAf7pKYTNmDQ5z27DVopqaFw00MIVqQkae_zSPX4dsNeeoTTXrwUGqitLaGap5ol81LKD9JdP3nSUYLfq0vLsHNDyNgb306TfbOenRRVsgQS8tJyLcknSKktWD_Qn7E5vjOXprXPrmdp7g5OPvrbz9QkWa1JTRfo2n2AXV02LPFc-UfR9bWCBEIJBxvmbpmqt0MnBTHWnth2b0CU_KJTDCY3kAPLGbOT8A4KiI73pRW-e9SWTaQXskw3Ei_dHRILM_l9OXsqoYHJ4Dd3tbfvmjoNYggSw4j50l3unI9d1qR5xlBFpW5sLr8gKX4bnY4SR2nyNiOQNLyPc0B0nW502aMEUCIQDTGOX-i_QrffJDY8XvKbPwMuBVrOSO-ayvTnWs_WSuDQIgZ7fMAvD_Ezyy5jg6fQeuOkoJi8V2naCtzV-HTly8NwW='), @@ -140,7 +140,7 @@ public function testRegisterAttest() $config->getVersion(), $config->getAppId(), Helpers::urlSafeBase64Decode('5CBRhGBb2CXSum71GNREBGft7yz9g1jZO7JTkHGFsVY'), - new SignRequestCollection + new SignRequestCollection() ), new RegisterResponse( Helpers::urlSafeBase64Decode('BQRX1gfcG-ofTlk9rjB9spsIMrmT9ba0DLto5fzk8FDB05ModNU2sWAqoQRemYiUrILQdbNGpN_aHA0_oq8kcd_XQCK-Ut0PWaOtz43t0aAV04U788e-dvpeqLtHxtINjgmutKM8_GJQ7F-3W0dogUjSANuRYRdkkSEHPcVdLSkpyfowggIbMIIBBaADAgECAgRAxBIlMAsGCSqGSIb3DQEBCzAuMSwwKgYDVQQDEyNZdWJpY28gVTJGIFJvb3QgQ0EgU2VyaWFsIDQ1NzIwMDYzMTAgFw0xNDA4MDEwMDAwMDBaGA8yMDUwMDkwNDAwMDAwMFowKjEoMCYGA1UEAwwfWXViaWNvIFUyRiBFRSBTZXJpYWwgMTA4NjU5MTUyNTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABK2iSVV7KGNEdPE-oHGvobNnHVw6ZZ6vB3jNIYB1C4t32OucHzMweHqM5CAMSMDHtfp1vuJYaiQSk7jb6M48WtejEjAQMA4GCisGAQQBgsQKAQEEADALBgkqhkiG9w0BAQsDggEBAVg0BoEHEEp4LJLYPYFACRGS8WZiXkCA8crYLgGnzvfKXwPwyKJlUzYxxv5xoRrl5zjkIUXhZ4mnHZVsnj9EY_VGDuRRzKX7YtxTZpFZn7ej3abjLhckTkkQ_AhUkmP7VuK2AWLgYsS8ejGUqughBsKvh_84uxTAEr5BS-OGg2yi7UIjd8W0nOCc6EN8d_8wCiPOjt2Y_-TKpLLTXKszk4UnWNzRdxBThmBBprJBZbF1VyVRvJm5yRLBpth3G8KMvrt4Nu3Ecoj_Q154IJpWe1Dp1upDFLOG9nWCRQk25Y264k9BDISfqs-wHvUjIo2iDnKl5UVoauTWaT7M6KuEwl4wRAIgYUVjS_yTwJAtF35glSbf9Et-5tJzlHOeAqmbACd6pwsCIE0MkTR5XNQoO4XqDaUZCXmadWu8yU1gfE7AJI9JUUcc'), @@ -163,7 +163,7 @@ public function testRegisterAttestFail() $config->getVersion(), $config->getAppId(), Helpers::urlSafeBase64Decode('yKA0x075tjJ-GE7fKTfnzTOSaNUOWQxRd9TWz5aFOg8'), - new SignRequestCollection + new SignRequestCollection() ), new RegisterResponse( Helpers::urlSafeBase64Decode('BQQtEmhWVgvbh-8GpjsHbj_d5FB9iNoRL8mNEq34-ANufKWUpVdIj6BSB_m3eMoZ3GqnaDy3RA5eWP8mhTkT1Ht3QAk1GsmaPIQgXgvrBkCQoQtMFvmwYPfW5jpRgoMPFxquHS7MTt8lofZkWAK2caHD-YQQdaRBgd22yWIjPuWnHOcwggLiMIHLAgEBMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBDQTAeFw0xNDA1MTUxMjU4NTRaFw0xNDA2MTQxMjU4NTRaMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBFRTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNsK2_Uhx1zOY9ym4eglBg2U5idUGU-dJK8mGr6tmUQflaNxkQo6IOc-kV4T6L44BXrVeqN-dpCPr-KKlLYw650wDQYJKoZIhvcNAQELBQADggIBAJVAa1Bhfa2Eo7TriA_jMA8togoA2SUE7nL6Z99YUQ8LRwKcPkEpSpOsKYWJLaR6gTIoV3EB76hCiBaWN5HV3-CPyTyNsM2JcILsedPGeHMpMuWrbL1Wn9VFkc7B3Y1k3OmcH1480q9RpYIYr-A35zKedgV3AnvmJKAxVhv9GcVx0_CewHMFTryFuFOe78W8nFajutknarupekDXR4tVcmvj_ihJcST0j_Qggeo4_3wKT98CgjmBgjvKCd3Kqg8n9aSDVWyaOZsVOhZj3Fv5rFu895--D4qiPDETozJIyliH-HugoQpqYJaTX10mnmMdCa6aQeW9CEf-5QmbIP0S4uZAf7pKYTNmDQ5z27DVopqaFw00MIVqQkae_zSPX4dsNeeoTTXrwUGqitLaGap5ol81LKD9JdP3nSUYLfq0vLsHNDyNgb306TfbOenRRVsgQS8tJyLcknSKktWD_Qn7E5vjOXprXPrmdp7g5OPvrbz9QkWa1JTRfo2n2AXV02LPFc-UfR9bWCBEIJBxvmbpmqt0MnBTHWnth2b0CU_KJTDCY3kAPLGbOT8A4KiI73pRW-e9SWTaQXskw3Ei_dHRILM_l9OXsqoYHJ4Dd3tbfvmjoNYggSw4j50l3unI9d1qR5xlBFpW5sLr8gKX4bnY4SR2nyNiOQNLyPc0B0nW502aMEUCIQDTGOX-i_QrffJDY8XvKbPwMuBVrOSO-ayvTnWs_WSuDQIgZ7fMAvD_Ezyy5jg6fQeuOkoJi8V2naCtzV-HTly8Nww='), @@ -186,7 +186,7 @@ public function testRegisterInvalidCertificate() $config->getVersion(), $config->getAppId(), Helpers::urlSafeBase64Decode('yKA0x075tjJ-GE7fKTfnzTOSaNUOWQxRd9TWz5aFOg8'), - new SignRequestCollection + new SignRequestCollection() ), new RegisterResponse( Helpers::urlSafeBase64Decode('BQQtEmhWVgvbh-8GpjsHbj_d5FB9iNoRL8mNEq34-ANufKWUpVdIj6BSB_m3eMoZ3GqnaDy3RA5eWP8mhTkT1Ht3QAk1GsmaPIQgXgvrBkCQoQtMFvmwYPfW5jpRgoMPFxquHS7MTt8lofZkWAK2caHD-YQQdaRBgd22yWIjPuWnHOcwggLiMIHLAgEBMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBDQTAeFw0xNDA1MTUxMjU4NTRaFw0xNDA2MTQxMjU4NTRaMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBFRTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABdsK2_Uhx1zOY9ym4eglBg2U5idUGU-dJK8mGr6tmUQflaNxkQo6IOc-kV4T6L44BXrVeqN-dpCPr-KKlLYw650wDQYJKoZIhvcNAQELBQADggIBAJVAa1Bhfa2Eo7TriA_jMA8togoA2SUE7nL6Z99YUQ8LRwKcPkEpSpOsKYWJLaR6gTIoV3EB76hCiBaWN5HV3-CPyTyNsM2JcILsedPGeHMpMuWrbL1Wn9VFkc7B3Y1k3OmcH1480q9RpYIYr-A35zKedgV3AnvmJKAxVhv9GcVx0_CewHMFTryFuFOe78W8nFajutknarupekDXR4tVcmvj_ihJcST0j_Qggeo4_3wKT98CgjmBgjvKCd3Kqg8n9aSDVWyaOZsVOhZj3Fv5rFu895--D4qiPDETozJIyliH-HugoQpqYJaTX10mnmMdCa6aQeW9CEf-5QmbIP0S4uZAf7pKYTNmDQ5z27DVopqaFw00MIVqQkae_zSPX4dsNeeoTTXrwUGqitLaGap5ol81LKD9JdP3nSUYLfq0vLsHNDyNgb306TfbOenRRVsgQS8tJyLcknSKktWD_Qn7E5vjOXprXPrmdp7g5OPvrbz9QkWa1JTRfo2n2AXV02LPFc-UfR9bWCBEIJBxvmbpmqt0MnBTHWnth2b0CU_KJTDCY3kAPLGbOT8A4KiI73pRW-e9SWTaQXskw3Ei_dHRILM_l9OXsqoYHJ4Dd3tbfvmjoNYggSw4j50l3unI9d1qR5xlBFpW5sLr8gKX4bnY4SR2nyNiOQNLyPc0B0nW502aMEUCIQDTGOX-i_QrffJDY8XvKbPwMuBVrOSO-ayvTnWs_WSuDQIgZ7fMAvD_Ezyy5jg6fQeuOkoJi8V2naCtzV-HTly8Nww='), @@ -209,7 +209,7 @@ public function testRegisterInvalidPublicKey() $config->getVersion(), $config->getAppId(), Helpers::urlSafeBase64Decode('yKA0x075tjJ-GE7fKTfnzTOSaNUOWQxRd9TWz5aFOg8'), - new SignRequestCollection + new SignRequestCollection() ), new RegisterResponse( Helpers::urlSafeBase64Decode('BQMtEmhWVgvbh-8GpjsHbj_d5FB9iNoRL8mNEq34-ANufKWUpVdIj6BSB_m3eMoZ3GqnaDy3RA5eWP8mhTkT1Ht3QAk1GsmaPIQgXgvrBkCQoQtMFvmwYPfW5jpRgoMPFxquHS7MTt8lofZkWAK2caHD-YQQdaRBgd22yWIjPuWnHOcwggLiMIHLAgEBMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBDQTAeFw0xNDA1MTUxMjU4NTRaFw0xNDA2MTQxMjU4NTRaMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBFRTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNsK2_Uhx1zOY9ym4eglBg2U5idUGU-dJK8mGr6tmUQflaNxkQo6IOc-kV4T6L44BXrVeqN-dpCPr-KKlLYw650wDQYJKoZIhvcNAQELBQADggIBAJVAa1Bhfa2Eo7TriA_jMA8togoA2SUE7nL6Z99YUQ8LRwKcPkEpSpOsKYWJLaR6gTIoV3EB76hCiBaWN5HV3-CPyTyNsM2JcILsedPGeHMpMuWrbL1Wn9VFkc7B3Y1k3OmcH1480q9RpYIYr-A35zKedgV3AnvmJKAxVhv9GcVx0_CewHMFTryFuFOe78W8nFajutknarupekDXR4tVcmvj_ihJcST0j_Qggeo4_3wKT98CgjmBgjvKCd3Kqg8n9aSDVWyaOZsVOhZj3Fv5rFu895--D4qiPDETozJIyliH-HugoQpqYJaTX10mnmMdCa6aQeW9CEf-5QmbIP0S4uZAf7pKYTNmDQ5z27DVopqaFw00MIVqQkae_zSPX4dsNeeoTTXrwUGqitLaGap5ol81LKD9JdP3nSUYLfq0vLsHNDyNgb306TfbOenRRVsgQS8tJyLcknSKktWD_Qn7E5vjOXprXPrmdp7g5OPvrbz9QkWa1JTRfo2n2AXV02LPFc-UfR9bWCBEIJBxvmbpmqt0MnBTHWnth2b0CU_KJTDCY3kAPLGbOT8A4KiI73pRW-e9SWTaQXskw3Ei_dHRILM_l9OXsqoYHJ4Dd3tbfvmjoNYggSw4j50l3unI9d1qR5xlBFpW5sLr8gKX4bnY4SR2nyNiOQNLyPc0B0nW502aMEUCIQDTGOX-i_QrffJDY8XvKbPwMuBVrOSO-ayvTnWs_WSuDQIgZ7fMAvD_Ezyy5jg6fQeuOkoJi8V2naCtzV-HTly8Nww='), @@ -224,14 +224,14 @@ public function testAuthenticate() $server = new Server($config); $registration = $server->authenticate( - (new SignRequestCollection) + (new SignRequestCollection()) ->add(new SignRequest( $config->getVersion(), $config->getAppId(), Helpers::urlSafeBase64Decode('fEnc9oV79EaBgK5BoNERU5gPKM2XGYWrz4fUjgc0Q7g'), Helpers::urlSafeBase64Decode('CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w') )), - (new RegistrationCollection) + (new RegistrationCollection()) ->add((new Registration( Helpers::urlSafeBase64Decode('BC0SaFZWC9uH7wamOwduP93kUH2I2hEvyY0Srfj4A258pZSlV0iPoFIH-bd4yhncaqdoPLdEDl5Y_yaFORPUe3c'), Helpers::urlSafeBase64Decode('CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w'), @@ -261,14 +261,14 @@ public function testAuthenticateCounter() $server = new Server($config); $server->authenticate( - (new SignRequestCollection) + (new SignRequestCollection()) ->add(new SignRequest( $config->getVersion(), $config->getAppId(), Helpers::urlSafeBase64Decode('fEnc9oV79EaBgK5BoNERU5gPKM2XGYWrz4fUjgc0Q7g'), Helpers::urlSafeBase64Decode('CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w') )), - (new RegistrationCollection) + (new RegistrationCollection()) ->add((new Registration( Helpers::urlSafeBase64Decode('BC0SaFZWC9uH7wamOwduP93kUH2I2hEvyY0Srfj4A258pZSlV0iPoFIH-bd4yhncaqdoPLdEDl5Y_yaFORPUe3c'), Helpers::urlSafeBase64Decode('CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w'), @@ -293,14 +293,14 @@ public function testAuthenticateFail() $server = new Server($config); $server->authenticate( - (new SignRequestCollection) + (new SignRequestCollection()) ->add(new SignRequest( $config->getVersion(), $config->getAppId(), Helpers::urlSafeBase64Decode('fEnc9oV79EaBgK5BoNERU5gPKM2XGYWrz4fUjgc0Q7g'), Helpers::urlSafeBase64Decode('CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w') )), - (new RegistrationCollection) + (new RegistrationCollection()) ->add(new Registration( Helpers::urlSafeBase64Decode('BC0SaFZWC9uH7wamOwduP93kUH2I2hEvyY0Srfj4A258pZSlV0iPoFIH-bd4yhncaqdoPLdEDl5Y_yaFORPUe3c'), Helpers::urlSafeBase64Decode('CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w'), @@ -324,14 +324,14 @@ public function testAuthenticateWrongRequest() $server = new Server($config); $server->authenticate( - (new SignRequestCollection) + (new SignRequestCollection()) ->add(new SignRequest( $config->getVersion(), $config->getAppId(), Helpers::urlSafeBase64Decode('fEnc9oV79EaBgK5BoNERU5gPKM2XGYWrz4fUjgc0Q7g'), Helpers::urlSafeBase64Decode('cTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w') )), - (new RegistrationCollection) + (new RegistrationCollection()) ->add((new Registration( Helpers::urlSafeBase64Decode('BC0SaFZWC9uH7wamOwduP93kUH2I2hEvyY0Srfj4A258pZSlV0iPoFIH-bd4yhncaqdoPLdEDl5Y_yaFORPUe3c'), Helpers::urlSafeBase64Decode('CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w'), @@ -355,14 +355,14 @@ public function testAuthenticateWrongRegistration() $server = new Server($config); $server->authenticate( - (new SignRequestCollection) + (new SignRequestCollection()) ->add(new SignRequest( $config->getVersion(), $config->getAppId(), Helpers::urlSafeBase64Decode('fEnc9oV79EaBgK5BoNERU5gPKM2XGYWrz4fUjgc0Q7g'), Helpers::urlSafeBase64Decode('CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w') )), - (new RegistrationCollection) + (new RegistrationCollection()) ->add((new Registration( Helpers::urlSafeBase64Decode('BC0SaFZWC9uH7wamOwduP93kUH2I2hEvyY0Srfj4A258pZSlV0iPoFIH-bd4yhncaqdoPLdEDl5Y_yaFORPUe3c'), Helpers::urlSafeBase64Decode('cTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w'), @@ -386,14 +386,14 @@ public function testAuthenticateInvalidPublicKey() $server = new Server($config); $server->authenticate( - (new SignRequestCollection) + (new SignRequestCollection()) ->add(new SignRequest( $config->getVersion(), $config->getAppId(), Helpers::urlSafeBase64Decode('fEnc9oV79EaBgK5BoNERU5gPKM2XGYWrz4fUjgc0Q7g'), Helpers::urlSafeBase64Decode('CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w') )), - (new RegistrationCollection) + (new RegistrationCollection()) ->add((new Registration( Helpers::urlSafeBase64Decode('bC0SaFZWC9uH7wamOwduP93kUH2I2hEvyY0Srfj4A258pZSlV0iPoFIH-bd4yhncaqdoPLdEDl5Y_yaFORPUe3c'), Helpers::urlSafeBase64Decode('CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w'), diff --git a/tests/U2f/Server/SignRequestCollectionTest.php b/tests/U2f/Server/SignRequestCollectionTest.php index 609f2ba..f40730e 100644 --- a/tests/U2f/Server/SignRequestCollectionTest.php +++ b/tests/U2f/Server/SignRequestCollectionTest.php @@ -11,7 +11,7 @@ class SignRequestCollectionTest extends \PHPUnit_Framework_TestCase public function testGetSet() { - $requests = new SignRequestCollection; + $requests = new SignRequestCollection(); $requests->add(new SignRequest('a', 'b', 'c', 'd')); $requests->add(new SignRequest('e', 'f', 'g', 'h')); $this->assertCount(2, $requests); @@ -20,7 +20,7 @@ public function testGetSet() public function testGetMatchingRequest() { - $requests = new SignRequestCollection; + $requests = new SignRequestCollection(); $requests->add($request = new SignRequest('a', 'b', 'c', 'd')); $this->assertSame($request, $requests->getMatchingRequest(new SignResponse('d', 'abcdef', '{"challenge":"Yw"}'))); @@ -30,7 +30,7 @@ public function testJsonSerialize() { $this->assertSame( '[{"version":"a","challenge":"Yw","keyHandle":"ZA","appId":"b"}]', - json_encode((new SignRequestCollection)->add(new SignRequest('a', 'b', 'c', 'd'))) + json_encode((new SignRequestCollection())->add(new SignRequest('a', 'b', 'c', 'd'))) ); }