Completed
Push — master ( 23cd7e...7877b2 )
by Francesco
02:54
created
Model/Key.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@
 block discarded – undo
92 92
 
93 93
         // rawKey is locked and become instance of \Defuse\Crypto\Key.
94 94
         $this->rawKey = $this->getRawKey()
95
-                             ->unlockKey($this->getSecret());
95
+                                ->unlockKey($this->getSecret());
96 96
 
97 97
         return $this;
98 98
     }
Please login to merge, or discard this patch.
Command/AbstractCommand.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@
 block discarded – undo
99 99
          * @var FormatterHelper
100 100
          */
101 101
         $formatter = $this->getHelperSet()
102
-                          ->get('formatter');
102
+                            ->get('formatter');
103 103
 
104 104
         $output->writeln(array(
105 105
             '',
Please login to merge, or discard this patch.
Command/SecretGeneratorCommand.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -26,13 +26,13 @@
 block discarded – undo
26 26
     protected function configure()
27 27
     {
28 28
         $this->setName('mes:crypto:generate-secret')
29
-             ->setDescription('Generates an authentication secret')
30
-             ->setHelp(<<<'EOF'
29
+                ->setDescription('Generates an authentication secret')
30
+                ->setHelp(<<<'EOF'
31 31
 The <info>%command.name%</info> generates an authentication secret.
32 32
 
33 33
 <info>%command.full_name%</info>
34 34
 EOF
35
-             );
35
+                );
36 36
     }
37 37
 
38 38
     /**
Please login to merge, or discard this patch.
DependencyInjection/Configuration.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
         $rootNode = $treeBuilder->root('mes_crypto');
32 32
 
33 33
         $rootNode
34
-          ->children()
34
+            ->children()
35 35
             ->arrayNode('key')
36 36
                 ->addDefaultsIfNotSet()
37 37
                 ->children()
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
                 ->info('your_encryption_service_id. Default: Mes Encryption.')
99 99
                 ->defaultNull()
100 100
             ->end()
101
-          ->end()
101
+            ->end()
102 102
         ;
103 103
 
104 104
         return $treeBuilder;
Please login to merge, or discard this patch.
Tests/KeyStorage/KeyStorageTest.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
         $this->keyStorage->setKey($key);
35 35
 
36 36
         $this->assertInstanceOf('Defuse\Crypto\KeyProtectedByPassword', $this->keyStorage->getKey()
37
-                                                                                         ->getRawKey());
37
+                                                                                            ->getRawKey());
38 38
         $this->assertSame($secret, $this->keyStorage->getKey()
39 39
                                                     ->getSecret());
40 40
     }
Please login to merge, or discard this patch.
Encryption.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,6 +49,6 @@
 block discarded – undo
49 49
     private function unlockKey(Key $key)
50 50
     {
51 51
         return $key->unlock()
52
-                   ->getRawKey();
52
+                    ->getRawKey();
53 53
     }
54 54
 }
Please login to merge, or discard this patch.
Command/KeyGeneratorCommand.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
         parent::initialize($input, $output);
42 42
 
43 43
         $this->helper = $this->getHelperSet()
44
-                             ->get('question');
44
+                                ->get('question');
45 45
 
46 46
         $this->symfonyStyle = $this->getStyle($input, $output);
47 47
     }
@@ -49,9 +49,9 @@  discard block
 block discarded – undo
49 49
     protected function configure()
50 50
     {
51 51
         $this->setName('mes:crypto:generate-key')
52
-             ->setDefinition($this->createDefinition())
53
-             ->setDescription('Generates an encoded key with or without authentication secret')
54
-             ->setHelp(<<<'EOF'
52
+                ->setDefinition($this->createDefinition())
53
+                ->setDescription('Generates an encoded key with or without authentication secret')
54
+                ->setHelp(<<<'EOF'
55 55
 The <info>%command.name%</info> generates an encoded key with or without authentication secret and optionally it saves the printable key and the secret in a ini format .crypto file.
56 56
 
57 57
 <info>%command.full_name%</info>
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 
61 61
 <info>%command.full_name%</info> --dir /path/to/dir/key.crypto
62 62
 EOF
63
-             );
63
+                );
64 64
     }
65 65
 
66 66
     protected function interact(InputInterface $input, OutputInterface $output)
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
         $this->writeSection($output, 'Generating key'.($secret ? ' with authentication secret' : '').($dir ? " in $dir" : ''));
134 134
 
135 135
         $encodedKey = $keyGenerator->generate($secret)
136
-                                   ->getEncoded();
136
+                                    ->getEncoded();
137 137
 
138 138
         $this->log($logger, "The encoded key has been generated with the following sequence:\n{$encodedKey}\n", LogLevel::INFO);
139 139
 
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
              * @var DebugFormatterHelper
198 198
              */
199 199
             $dh = $this->getHelperSet()
200
-                       ->get('debug_formatter');
200
+                        ->get('debug_formatter');
201 201
 
202 202
             $process = new Process("ls -la {$options['dir']} | grep \".crypto\"");
203 203
 
Please login to merge, or discard this patch.
DependencyInjection/MesCryptoExtension.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -129,23 +129,23 @@  discard block
 block discarded – undo
129 129
 
130 130
             // Reads encoded key from configuration file if key is not external.
131 131
             $rawKeyDefinition->setClass($defuseKey)
132
-                             ->setFactory(array(
133
-                                 $defuseKey,
134
-                                 'loadFromAsciiSafeString',
135
-                             ));
132
+                                ->setFactory(array(
133
+                                    $defuseKey,
134
+                                    'loadFromAsciiSafeString',
135
+                                ));
136 136
             $rawKeyDefinition->setArguments(array(
137 137
                 $keyIsExternal ? $loadKey : $key,
138 138
             ));
139 139
         } else {
140 140
             $rawKeyDefinition->setClass($defuseKey)
141
-                             ->setArguments($secretExists ? array($secretIsExternal ? $loadSecret : $secret) : array())
142
-                             ->setFactory($secretExists ? array(
143
-                                 'Defuse\Crypto\KeyProtectedByPassword',
144
-                                 'createRandomPasswordProtectedKey',
145
-                             ) : array(
146
-                                 'Defuse\Crypto\Key',
147
-                                 'createNewRandomKey',
148
-                             ));
141
+                                ->setArguments($secretExists ? array($secretIsExternal ? $loadSecret : $secret) : array())
142
+                                ->setFactory($secretExists ? array(
143
+                                    'Defuse\Crypto\KeyProtectedByPassword',
144
+                                    'createRandomPasswordProtectedKey',
145
+                                ) : array(
146
+                                    'Defuse\Crypto\Key',
147
+                                    'createNewRandomKey',
148
+                                ));
149 149
         }
150 150
 
151 151
         if ($createRandomKey || (!$createRandomKey && !$keyIsExternal)) {
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
         }
154 154
 
155 155
         $container->setDefinition('mes_crypto.raw_key', $rawKeyDefinition)
156
-                  ->setPublic(false);
156
+                    ->setPublic(false);
157 157
 
158 158
         // Key
159 159
         $keyDefinition = new Definition('Mes\Security\CryptoBundle\Model\Key', array(
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
             'create',
166 166
         ));
167 167
         $container->setDefinition('mes_crypto.key', $keyDefinition)
168
-                  ->setPublic(false);
168
+                    ->setPublic(false);
169 169
 
170 170
         $keyManagerDefinition = $container->getDefinition('mes_crypto.key_manager_wrapper');
171 171
 
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
     private function setCryptoLoaderResource(ContainerBuilder $container, $resource)
201 201
     {
202 202
         $container->getDefinition('mes_crypto.crypto_loader')
203
-                  ->replaceArgument(0, $resource);
203
+                    ->replaceArgument(0, $resource);
204 204
     }
205 205
 
206 206
     /**
Please login to merge, or discard this patch.
Tests/DependencyInjection/MesCryptoExtensionTest.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 
32 32
         $this->assertHasDefinition('mes_crypto.raw_key');
33 33
         $this->assertSame('Defuse\Crypto\Key', $this->configuration->findDefinition('mes_crypto.raw_key')
34
-                                                                   ->getClass(), 'Defuse\Crypto\Key class is correct');
34
+                                                                    ->getClass(), 'Defuse\Crypto\Key class is correct');
35 35
 
36 36
         $this->assertNotHasDefinition('mes_crypto.crypto_loader');
37 37
     }
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 
45 45
         $this->assertHasDefinition('mes_crypto.raw_key');
46 46
         $this->assertSame('Defuse\Crypto\KeyProtectedByPassword', $this->configuration->findDefinition('mes_crypto.raw_key')
47
-                                                                                      ->getClass(), 'KeyProtectedByPassword class is correct');
47
+                                                                                        ->getClass(), 'KeyProtectedByPassword class is correct');
48 48
 
49 49
         $this->assertNotHasDefinition('mes_crypto.crypto_loader');
50 50
     }
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 
58 58
         $this->assertHasDefinition('mes_crypto.raw_key');
59 59
         $this->assertSame('Defuse\Crypto\KeyProtectedByPassword', $this->configuration->findDefinition('mes_crypto.raw_key')
60
-                                                                                      ->getClass(), 'Defuse\Crypto\KeyProtectedByPassword class is correct');
60
+                                                                                        ->getClass(), 'Defuse\Crypto\KeyProtectedByPassword class is correct');
61 61
         $this->assertNotHasDefinition('mes_crypto.crypto_loader');
62 62
     }
63 63
 
@@ -69,11 +69,11 @@  discard block
 block discarded – undo
69 69
 
70 70
         $this->assertHasDefinition('mes_crypto.raw_key');
71 71
         $this->assertSame('Defuse\Crypto\KeyProtectedByPassword', $this->configuration->findDefinition('mes_crypto.raw_key')
72
-                                                                                      ->getClass(), 'Defuse\Crypto\KeyProtectedByPassword class is correct');
72
+                                                                                        ->getClass(), 'Defuse\Crypto\KeyProtectedByPassword class is correct');
73 73
         $this->assertHasDefinition('mes_crypto.crypto_loader');
74 74
 
75 75
         $keyResource = $this->configuration->findDefinition('mes_crypto.crypto_loader')
76
-                                           ->getArgument(0);
76
+                                            ->getArgument(0);
77 77
 
78 78
         $this->assertContains('key.crypto', $keyResource, sprintf('crypto file is %s', 'key.crypto'));
79 79
     }
@@ -86,11 +86,11 @@  discard block
 block discarded – undo
86 86
 
87 87
         $this->assertHasDefinition('mes_crypto.raw_key');
88 88
         $this->assertSame('Defuse\Crypto\KeyProtectedByPassword', $this->configuration->findDefinition('mes_crypto.raw_key')
89
-                                                                                      ->getClass(), 'Defuse\Crypto\KeyProtectedByPassword class is correct');
89
+                                                                                        ->getClass(), 'Defuse\Crypto\KeyProtectedByPassword class is correct');
90 90
         $this->assertHasDefinition('mes_crypto.crypto_loader');
91 91
 
92 92
         $keyResource = $this->configuration->findDefinition('mes_crypto.crypto_loader')
93
-                                           ->getArgument(0);
93
+                                            ->getArgument(0);
94 94
 
95 95
         $this->assertContains('key.crypto', $keyResource, sprintf('crypto file is %s', 'key.crypto'));
96 96
 
Please login to merge, or discard this patch.