Carteni / crypto-bundle

Command/AbstractCommand.php

Doc Comments +5 added lines, -5 removed lines

@@ -74,8 +74,8 @@ 
     }
 
     /**
-     * @param $question
-     * @param $default
+     * @param string $question
+     * @param string $default
      * @param string $sep
      *
      * @return string
@@ -90,7 +90,7 @@ 
 
     /**
      * @param \Symfony\Component\Console\Output\OutputInterface $output
-     * @param $text
+     * @param string $text
      * @param string $style
      */
     protected function writeSection(OutputInterface $output, $text, $style = 'bg=blue;fg=white')
@@ -109,8 +109,8 @@ 
     }
 
     /**
-     * @param $text
-     * @param $style
+     * @param string $text
+     * @param string $style
      *
      * @return string
      */

Indentation +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
          * @var FormatterHelper
          */
         $formatter = $this->getHelperSet()
-                          ->get('formatter');
+                            ->get('formatter');
 
         $output->writeln(array(
             '',

Encryption.php

Doc Comments +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
     /**
      * @param Key|KeyInterface $key
      *
-     * @return \Defuse\Crypto\Key|\Defuse\Crypto\KeyProtectedByPassword
+     * @return \Defuse\Crypto\Key
      */
     private function unlockKey(Key $key)
     {

Indentation +1 added lines, -1 removed lines

@@ -49,6 +49,6 @@
     private function unlockKey(Key $key)
     {
         return $key->unlock()
-                   ->getRawKey();
+                    ->getRawKey();
     }
 }

Tests/Command/KeyGeneratorCommandTest.php

Doc Comments +3 added lines

@@ -135,6 +135,9 @@
         $this->helper = null;
     }
 
+    /**
+     * @param string[] $input
+     */
     private function getInputStream($input)
     {
         $stream = fopen('php://memory', 'r+', false);

Model/Key.php

Indentation +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
 
         // rawKey is locked and become instance of \Defuse\Crypto\Key.
         $this->rawKey = $this->getRawKey()
-                             ->unlockKey($this->getSecret());
+                                ->unlockKey($this->getSecret());
 
         return $this;
     }

Command/SecretGeneratorCommand.php

Indentation +3 added lines, -3 removed lines

@@ -26,13 +26,13 @@
     protected function configure()
     {
         $this->setName('mes:crypto:generate-secret')
-             ->setDescription('Generates an authentication secret')
-             ->setHelp(<<<'EOF'
+                ->setDescription('Generates an authentication secret')
+                ->setHelp(<<<'EOF'
 The <info>%command.name%</info> generates an authentication secret.
 
 <info>%command.full_name%</info>
 EOF
-             );
+                );
     }
 
     /**

Command/KeyGeneratorCommand.php

Spacing +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
             $random = \bin2hex(random_bytes(20));
             $this->symfonyStyle->newLine();
             $question = new Question($this->getQuestion('Insert your authentication secret or use this one randomly generated', $random), $random);
-            $question->setValidator(function ($secret) {
+            $question->setValidator(function($secret) {
                 if (!ctype_print($secret)) {
                     throw new \RuntimeException(sprintf('The authentication secret is not printable', $secret));
                 }
@@ -206,7 +206,7 @@ 
                 $dh->start(spl_object_hash($process), "Find {$options['dir']}", 'START'),
             ));
 
-            $process->run(function ($type, $buffer) use ($process, $output, $dh) {
+            $process->run(function($type, $buffer) use ($process, $output, $dh) {
                 $output->writeln($dh->progress(spl_object_hash($process), $buffer, Process::ERR === $type));
             });
 

Indentation +7 added lines, -7 removed lines

@@ -41,7 +41,7 @@ 
         parent::initialize($input, $output);
 
         $this->helper = $this->getHelperSet()
-                             ->get('question');
+                                ->get('question');
 
         $this->symfonyStyle = $this->getStyle($input, $output);
     }
@@ -49,9 +49,9 @@ 
     protected function configure()
     {
         $this->setName('mes:crypto:generate-key')
-             ->setDefinition($this->createDefinition())
-             ->setDescription('Generates an encoded key with or without authentication secret')
-             ->setHelp(<<<'EOF'
+                ->setDefinition($this->createDefinition())
+                ->setDescription('Generates an encoded key with or without authentication secret')
+                ->setHelp(<<<'EOF'
 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.
 
 <info>%command.full_name%</info>
@@ -60,7 +60,7 @@ 
 
 <info>%command.full_name%</info> --dir /path/to/dir/key.crypto
 EOF
-             );
+                );
     }
 
     protected function interact(InputInterface $input, OutputInterface $output)
@@ -133,7 +133,7 @@ 
         $this->writeSection($output, 'Generating key'.($secret ? ' with authentication secret' : '').($dir ? " in $dir" : ''));
 
         $encodedKey = $keyGenerator->generate($secret)
-                                   ->getEncoded();
+                                    ->getEncoded();
 
         $this->log($logger, "The encoded key has been generated with the following sequence:\n{$encodedKey}\n", LogLevel::INFO);
 
@@ -197,7 +197,7 @@ 
              * @var DebugFormatterHelper
              */
             $dh = $this->getHelperSet()
-                       ->get('debug_formatter');
+                        ->get('debug_formatter');
 
             $process = new Process("ls -la {$options['dir']} | grep \".crypto\"");
 

DependencyInjection/MesCryptoExtension.php

Indentation +15 added lines, -15 removed lines

@@ -125,27 +125,27 @@ 
 
             // Reads encoded key from configuration file if key is not external.
             $rawKeyDefinition->setClass($defuseKey)
-                             ->setFactory(array(
-                                 $defuseKey,
-                                 'loadFromAsciiSafeString',
-                             ));
+                                ->setFactory(array(
+                                    $defuseKey,
+                                    'loadFromAsciiSafeString',
+                                ));
             $rawKeyDefinition->setArguments(array(
                 $keyIsExternal ? $loadKey : $key,
             ));
         } else {
             $rawKeyDefinition->setClass($defuseKey)
-                             ->setArguments($secretExists ? array($secretIsExternal ? $loadSecret : $secret) : array())
-                             ->setFactory($secretExists ? array(
-                                 'Defuse\Crypto\KeyProtectedByPassword',
-                                 'createRandomPasswordProtectedKey',
-                             ) : array(
-                                 'Defuse\Crypto\Key',
-                                 'createNewRandomKey',
-                             ));
+                                ->setArguments($secretExists ? array($secretIsExternal ? $loadSecret : $secret) : array())
+                                ->setFactory($secretExists ? array(
+                                    'Defuse\Crypto\KeyProtectedByPassword',
+                                    'createRandomPasswordProtectedKey',
+                                ) : array(
+                                    'Defuse\Crypto\Key',
+                                    'createNewRandomKey',
+                                ));
         }
 
         $container->setDefinition('mes_crypto.raw_key', $rawKeyDefinition)
-                  ->setPublic(false);
+                    ->setPublic(false);
 
         // Key
         $keyDefinition = new Definition('Mes\Security\CryptoBundle\Model\Key', array(
@@ -157,7 +157,7 @@ 
             'create',
         ));
         $container->setDefinition('mes_crypto.key', $keyDefinition)
-                  ->setPublic(false);
+                    ->setPublic(false);
 
         $keyManagerDefinition = $container->getDefinition('mes_crypto.key_manager_wrapper');
 
@@ -192,7 +192,7 @@ 
     private function setCryptoLoaderResource(ContainerBuilder $container, $resource)
     {
         $container->getDefinition('mes_crypto.crypto_loader')
-                  ->replaceArgument(0, $resource);
+                    ->replaceArgument(0, $resource);
     }
 
     /**

DependencyInjection/Configuration.php

Indentation +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
         $rootNode = $treeBuilder->root('mes_crypto');
 
         $rootNode
-          ->children()
+            ->children()
             ->arrayNode('key')
                 ->addDefaultsIfNotSet()
                 ->children()
@@ -98,7 +98,7 @@ 
                 ->info('your_encryption_service_id. Default: Mes Encryption.')
                 ->defaultNull()
             ->end()
-          ->end()
+            ->end()
         ;
 
         return $treeBuilder;

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
                 ->info('Encoded key or path to .crypto file. If key is null, it generates a different random key for each request.')
                 ->beforeNormalization()
                     ->ifString()
-                    ->then(function ($v) {
+                    ->then(function($v) {
                         if (is_file($v) && is_readable($v)) {
                             return array('path' => $v);
                         }
@@ -51,7 +51,7 @@ 
                 ->end()
                 ->validate()
                 ->ifArray()
-                    ->then(function ($v) {
+                    ->then(function($v) {
                         $path = $v['path'];
                         $key = $v['key'];
 

Tests/KeyManagerTest.php

Indentation +20 added lines, -20 removed lines

@@ -36,9 +36,9 @@ 
     public function testGenerateCreatesKey()
     {
         $this->keyGenerator->expects($this->once())
-                           ->method('generate')
-                           ->with(null)
-                           ->will($this->returnValue($this->getMock('Mes\Security\CryptoBundle\Model\KeyInterface')));
+                            ->method('generate')
+                            ->with(null)
+                            ->will($this->returnValue($this->getMock('Mes\Security\CryptoBundle\Model\KeyInterface')));
 
         $key = $this->keyManager->generate();
 
@@ -51,9 +51,9 @@ 
         $secret = 'ThisIsASecretPassword';
 
         $this->keyGenerator->expects($this->once())
-                           ->method('generateFromAscii')
-                           ->with($key_encoded, $secret)
-                           ->will($this->returnValue($this->getMock('Mes\Security\CryptoBundle\Model\KeyInterface')));
+                            ->method('generateFromAscii')
+                            ->with($key_encoded, $secret)
+                            ->will($this->returnValue($this->getMock('Mes\Security\CryptoBundle\Model\KeyInterface')));
 
         $key = $this->keyManager->generateFromAscii($key_encoded, $secret);
 
@@ -63,16 +63,16 @@ 
     public function testGetKeyReadsNotExistingKey()
     {
         $this->keyStorage->expects($this->once())
-                         ->method('getKey')
-                         ->will($this->returnValue(null));
+                            ->method('getKey')
+                            ->will($this->returnValue(null));
 
         $this->keyGenerator->expects($this->once())
-                           ->method('generate')
-                           ->with(null)
-                           ->will($this->returnValue($this->getMock('Mes\Security\CryptoBundle\Model\KeyInterface')));
+                            ->method('generate')
+                            ->with(null)
+                            ->will($this->returnValue($this->getMock('Mes\Security\CryptoBundle\Model\KeyInterface')));
 
         $this->keyStorage->expects($this->once())
-                         ->method('setKey');
+                            ->method('setKey');
 
         $key = $this->keyManager->getKey();
 
@@ -82,14 +82,14 @@ 
     public function testGetKeyReadsExistingKey()
     {
         $this->keyStorage->expects($this->never())
-                         ->method('setKey');
+                            ->method('setKey');
 
         $this->keyGenerator->expects($this->never())
-                           ->method('generate');
+                            ->method('generate');
 
         $this->keyStorage->expects($this->once())
-                         ->method('getKey')
-                         ->will($this->returnValue($this->getMock('Mes\Security\CryptoBundle\Model\KeyInterface')));
+                            ->method('getKey')
+                            ->will($this->returnValue($this->getMock('Mes\Security\CryptoBundle\Model\KeyInterface')));
 
         $key = $this->keyManager->getKey();
 
@@ -99,8 +99,8 @@ 
     public function testSetKeyStoresKey()
     {
         $this->keyStorage->expects($this->once())
-                         ->method('setKey')
-                         ->with($this->getMock('Mes\Security\CryptoBundle\Model\KeyInterface'));
+                            ->method('setKey')
+                            ->with($this->getMock('Mes\Security\CryptoBundle\Model\KeyInterface'));
 
         $this->keyManager->setKey($this->getMock('Mes\Security\CryptoBundle\Model\KeyInterface'));
     }
@@ -115,10 +115,10 @@ 
     protected function setUp()
     {
         $this->keyStorage = $this->getMockBuilder('Mes\Security\CryptoBundle\KeyStorage\KeyStorageInterface')
-                                 ->getMock();
+                                    ->getMock();
 
         $this->keyGenerator = $this->getMockBuilder('Mes\Security\CryptoBundle\KeyGenerator\KeyGeneratorInterface')
-                                   ->getMock();
+                                    ->getMock();
 
         $this->keyManager = new KeyManager($this->keyStorage, $this->keyGenerator);
     }