@@ -7,4 +7,4 @@ |
||
7 | 7 | * @link https://github.com/XigenChris/ComodoDecodeCSR |
8 | 8 | */ |
9 | 9 | |
10 | -require __DIR__ . '/../vendor/autoload.php'; |
|
10 | +require __DIR__.'/../vendor/autoload.php'; |
@@ -44,14 +44,14 @@ discard block |
||
44 | 44 | |
45 | 45 | public function testWithJustSH1() |
46 | 46 | { |
47 | - $response = $this->validSHA1 . "\n"; |
|
47 | + $response = $this->validSHA1."\n"; |
|
48 | 48 | $test = $this->checkresponse($response); |
49 | 49 | $this->assertFalse($test); |
50 | 50 | } |
51 | 51 | |
52 | 52 | public function testWithSH1AndComdoText() |
53 | 53 | { |
54 | - $response = $this->validSHA1 . "\n"; |
|
54 | + $response = $this->validSHA1."\n"; |
|
55 | 55 | $response .= "comodoca.com\n"; |
56 | 56 | $test = $this->checkresponse($response); |
57 | 57 | $this->assertTrue($test); |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | |
60 | 60 | public function testWithSH1AndComdoTextNoTrailingReturn() |
61 | 61 | { |
62 | - $response = $this->validSHA1 . "\n"; |
|
62 | + $response = $this->validSHA1."\n"; |
|
63 | 63 | $response .= "comodoca.com"; |
64 | 64 | $test = $this->checkresponse($response); |
65 | 65 | $this->assertTrue($test); |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | |
68 | 68 | public function testWithSH1AndComdoTextAndNewLine() |
69 | 69 | { |
70 | - $response = $this->validSHA1 . "\n"; |
|
70 | + $response = $this->validSHA1."\n"; |
|
71 | 71 | $response .= "comodoca.com\n\n"; |
72 | 72 | $test = $this->checkresponse($response); |
73 | 73 | $this->assertTrue($test); |
@@ -33,7 +33,7 @@ |
||
33 | 33 | { |
34 | 34 | $csrFile = $input->getArgument('csr'); |
35 | 35 | if (!file_exists($csrFile)) { |
36 | - $output->writeln('<error>Unable to load '. $csrFile .'</error>'); |
|
36 | + $output->writeln('<error>Unable to load '.$csrFile.'</error>'); |
|
37 | 37 | $output->writeln('<error>Please check the path and try again</error>'); |
38 | 38 | return false; |
39 | 39 | } |
@@ -36,8 +36,8 @@ |
||
36 | 36 | $hashes = $comodoDecodeCSR->fetchHashes(); |
37 | 37 | |
38 | 38 | if ($hashes) { |
39 | - $output->writeln('<info>MD5</info> ' . $hashes['md5']); |
|
40 | - $output->writeln('<info>SHA1</info> ' . $hashes['sha1']); |
|
39 | + $output->writeln('<info>MD5</info> '.$hashes['md5']); |
|
40 | + $output->writeln('<info>SHA1</info> '.$hashes['sha1']); |
|
41 | 41 | |
42 | 42 | return 0; |
43 | 43 | } |
@@ -42,10 +42,10 @@ |
||
42 | 42 | return 2; |
43 | 43 | } |
44 | 44 | |
45 | - $output->writeln('<info>Filename:</info> ' . $hashes['md5'] . '.txt'); |
|
45 | + $output->writeln('<info>Filename:</info> '.$hashes['md5'].'.txt'); |
|
46 | 46 | $output->writeln('<info>Contents:</info>'); |
47 | 47 | $output->writeln($comodoDecodeCSR->generateDVC()); |
48 | - $output->writeln('<info>URL:</info> http://' . $comodoDecodeCSR->getCN() . '/' . $hashes['md5'] . '.txt'); |
|
48 | + $output->writeln('<info>URL:</info> http://'.$comodoDecodeCSR->getCN().'/'.$hashes['md5'].'.txt'); |
|
49 | 49 | |
50 | 50 | return 0; |
51 | 51 | } |
@@ -58,6 +58,10 @@ discard block |
||
58 | 58 | $this->Form['csr'] = $CSR; |
59 | 59 | } |
60 | 60 | |
61 | + /** |
|
62 | + * @param integer $code |
|
63 | + * @param string $message |
|
64 | + */ |
|
61 | 65 | protected function addWarning($code, $message) |
62 | 66 | { |
63 | 67 | $this->warnings[] = [ |
@@ -103,7 +107,7 @@ discard block |
||
103 | 107 | |
104 | 108 | /** |
105 | 109 | * |
106 | - * @param GuzzleHttp\Psr7\Response $response |
|
110 | + * @param Response $response |
|
107 | 111 | * @return bool |
108 | 112 | */ |
109 | 113 | public function checkDVC(Response $response) |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | { |
81 | 81 | $domain = $this->getCN(); |
82 | 82 | //We do most of our DVC over http:// unless the site is fully SSL |
83 | - $URL = 'http://' . $domain . "/" . $this->getMD5() . '.txt'; |
|
83 | + $URL = 'http://'.$domain."/".$this->getMD5().'.txt'; |
|
84 | 84 | |
85 | 85 | $client = new Client(['allow_redirects' => false, 'verify' => false]); |
86 | 86 | |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | |
96 | 96 | public function generateDVC() |
97 | 97 | { |
98 | - $DVC = $this->getSHA1() . "\n"; |
|
98 | + $DVC = $this->getSHA1()."\n"; |
|
99 | 99 | $DVC .= "comodoca.com\n"; |
100 | 100 | |
101 | 101 | return $DVC; |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | */ |
109 | 109 | public function checkDVC(Response $response) |
110 | 110 | { |
111 | - $body = $response->getBody() . ''; |
|
111 | + $body = $response->getBody().''; |
|
112 | 112 | $DVC = $this->generateDVC(); |
113 | 113 | |
114 | 114 | //Check if we received a 301 or 302 redirect |
@@ -126,13 +126,13 @@ discard block |
||
126 | 126 | |
127 | 127 | //Check if last 2 characters are new lines |
128 | 128 | if (substr($body, -2) === "\n\n") { |
129 | - $body = substr($body, 0, -2) . "\n"; |
|
129 | + $body = substr($body, 0, -2)."\n"; |
|
130 | 130 | } |
131 | 131 | |
132 | 132 | //Check if last character is not a new line |
133 | 133 | if (substr($body, -1) !== "\n") { |
134 | 134 | //Add said new line |
135 | - $body = $body . "\n"; |
|
135 | + $body = $body."\n"; |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | //Check it again |