boruta/common-abstraction package usage (code refactor)

Author: borutainfo

bin/DecryptData.php

@@ -4,8 +4,8 @@
  */
 
 use Boruta\BitcoinVanity\Command\DecryptDataCommand;
-use Boruta\BitcoinVanity\DependencyInjection\DependencyInjection;
-use Boruta\BitcoinVanity\ValueObject\RawString;
+use Boruta\CommonAbstraction\DependencyInjector\DependencyInjector;
+use Boruta\CommonAbstraction\ValueObject\RawString;
 
 /* config: */
 
@@ -18,6 +18,6 @@
 require __DIR__ . '/../vendor/autoload.php';
 
 /** @var DecryptDataCommand $decryptDataCommand */
-$decryptDataCommand = DependencyInjection::get(DecryptDataCommand::class);
+$decryptDataCommand = DependencyInjector::get(DecryptDataCommand::class);
 
 echo $decryptDataCommand->execute(new RawString($dataToDecrypt))->value() . PHP_EOL;

bin/GenerateVanityAddress.php

@@ -11,7 +11,8 @@
 use Boruta\BitcoinVanity\Collection\AddressEntityCollection;
 use Boruta\BitcoinVanity\Command\ConvertToAddressCommand;
 use Boruta\BitcoinVanity\Command\EncryptDataCommand;
-use Boruta\BitcoinVanity\DependencyInjection\DependencyInjection;
+use Boruta\CommonAbstraction\Config\DatabaseConfig;
+use Boruta\CommonAbstraction\DependencyInjector\DependencyInjector;
 use Boruta\BitcoinVanity\Entity\AddressEntity;
 use Boruta\BitcoinVanity\Entity\MnemonicSeedEntity;
 use Boruta\BitcoinVanity\Entity\PrivateKeyEntity;
@@ -20,7 +21,7 @@
 use Boruta\BitcoinVanity\Repository\PrivateKeyRepository;
 use Boruta\BitcoinVanity\ValueObject\DerivedPath;
 use Boruta\BitcoinVanity\ValueObject\EntropySize;
-use Boruta\BitcoinVanity\ValueObject\RawString;
+use Boruta\CommonAbstraction\ValueObject\RawString;
 
 /* config: */
 
@@ -39,16 +40,20 @@
 
 echo 'Starting...' . PHP_EOL;
 
+DependencyInjector::set(DatabaseConfig::class, function () {
+    return new DatabaseConfig(__DIR__ . '/../config/database.yml');
+});
+
 /** @var PrivateKeyRepository $privateKeyRepository */
-$privateKeyRepository = DependencyInjection::get(PrivateKeyRepository::class);
+$privateKeyRepository = DependencyInjector::get(PrivateKeyRepository::class);
 /** @var MnemonicSeedRepository $mnemonicSeedRepository */
-$mnemonicSeedRepository = DependencyInjection::get(MnemonicSeedRepository::class);
+$mnemonicSeedRepository = DependencyInjector::get(MnemonicSeedRepository::class);
 /** @var AddressRepository $addressRepository */
-$addressRepository = DependencyInjection::get(AddressRepository::class);
+$addressRepository = DependencyInjector::get(AddressRepository::class);
 /** @var ConvertToAddressCommand $convertToAddressCommand */
-$convertToAddressCommand = DependencyInjection::get(ConvertToAddressCommand::class);
+$convertToAddressCommand = DependencyInjector::get(ConvertToAddressCommand::class);
 /** @var EncryptDataCommand $encryptDataCommand */
-$encryptDataCommand = DependencyInjection::get(EncryptDataCommand::class);
+$encryptDataCommand = DependencyInjector::get(EncryptDataCommand::class);
 /** @var Bip39Mnemonic $bip39 */
 $bip39 = MnemonicFactory::bip39();
 /** @var Bip39SeedGenerator $seedGenerator */

bin/RateAddressValue.php

@@ -3,17 +3,18 @@
  * @author Sebastian Boruta <[email protected]>
  */
 
-use Boruta\BitcoinVanity\DependencyInjection\DependencyInjection;
+use Boruta\CommonAbstraction\Config\DatabaseConfig;
+use Boruta\CommonAbstraction\DependencyInjector\DependencyInjector;
 use Boruta\BitcoinVanity\Entity\AddressWordEntity;
 use Boruta\BitcoinVanity\Entity\WordEntity;
-use Boruta\BitcoinVanity\Exception\RepositoryException;
-use Boruta\BitcoinVanity\Exception\ValueObjectException;
+use Boruta\CommonAbstraction\Exception\RepositoryException;
+use Boruta\CommonAbstraction\Exception\ValueObjectException;
 use Boruta\BitcoinVanity\Repository\AddressRepository;
 use Boruta\BitcoinVanity\Repository\AddressWordRepository;
 use Boruta\BitcoinVanity\Repository\SemaphoreRepository;
 use Boruta\BitcoinVanity\Repository\WordRepository;
-use Boruta\BitcoinVanity\ValueObject\RawString;
-use Boruta\BitcoinVanity\ValueObject\UnsignedNumber;
+use Boruta\CommonAbstraction\ValueObject\RawString;
+use Boruta\CommonAbstraction\ValueObject\UnsignedNumber;
 use Boruta\BitcoinVanity\ValueObject\Word;
 
 /* config: */
@@ -32,14 +33,18 @@
 
 echo 'Starting...' . PHP_EOL;
 
+DependencyInjector::set(DatabaseConfig::class, function () {
+    return new DatabaseConfig(__DIR__ . '/../config/database.yml');
+});
+
 /** @var AddressRepository $addressRepository */
-$addressRepository = DependencyInjection::get(AddressRepository::class);
+$addressRepository = DependencyInjector::get(AddressRepository::class);
 /** @var AddressWordRepository $addressWordRepository */
-$addressWordRepository = DependencyInjection::get(AddressWordRepository::class);
+$addressWordRepository = DependencyInjector::get(AddressWordRepository::class);
 /** @var WordRepository $wordRepository */
-$wordRepository = DependencyInjection::get(WordRepository::class);
+$wordRepository = DependencyInjector::get(WordRepository::class);
 /** @var SemaphoreRepository $semaphoreRepository */
-$semaphoreRepository = DependencyInjection::get(SemaphoreRepository::class);
+$semaphoreRepository = DependencyInjector::get(SemaphoreRepository::class);
 
 $dictionaries = '';
 $directory = opendir($dictionariesLocation);

composer.json

@@ -14,6 +14,7 @@
   },
   "require": {
     "php": ">=7.1",
+    "boruta/common-abstraction": "0.1.2",
     "bitwasp/bitcoin": "0.0.35.1",
     "symfony/yaml": "4.2.1",
     "pimple/pimple": "3.2.3",

src/Collection/AbstractCollection.php

@@ -7,6 +7,7 @@
 
 
 use Boruta\BitcoinVanity\Entity\AddressEntity;
+use Boruta\CommonAbstraction\Collection\AbstractCollection;
 
 /**
  * Class AddressEntityCollection

src/Collection/AddressEntityCollection.php

@@ -7,6 +7,7 @@
 
 
 use Boruta\BitcoinVanity\Entity\PrivateKeyEntity;
+use Boruta\CommonAbstraction\Collection\AbstractCollection;
 
 /**
  * Class PrivateKeyEntityCollection

src/Collection/PrivateKeyEntityCollection.php

@@ -8,8 +8,8 @@
 
 use Boruta\BitcoinVanity\Config\EncryptionConfig;
 use Boruta\BitcoinVanity\Exception\EncryptionException;
-use Boruta\BitcoinVanity\Exception\ValueObjectException;
-use Boruta\BitcoinVanity\ValueObject\RawString;
+use Boruta\CommonAbstraction\Exception\ValueObjectException;
+use Boruta\CommonAbstraction\ValueObject\RawString;
 
 /**
  * Class DecryptDataCommand

src/Command/DecryptDataCommand.php

@@ -8,8 +8,8 @@
 
 use Boruta\BitcoinVanity\Config\EncryptionConfig;
 use Boruta\BitcoinVanity\Exception\EncryptionException;
-use Boruta\BitcoinVanity\Exception\ValueObjectException;
-use Boruta\BitcoinVanity\ValueObject\RawString;
+use Boruta\CommonAbstraction\Exception\ValueObjectException;
+use Boruta\CommonAbstraction\ValueObject\RawString;
 
 /**
  * Class EncryptDataCommand