Merge pull request #32 from remotelyliving/proposed

Proposed

Author: Christian Thomas

bootstrap/repl.php

@@ -5,28 +5,37 @@
 use RemotelyLiving\PHPDNS\Entities\DNSRecord;
 use RemotelyLiving\PHPDNS\Entities\DNSRecordType;
 use RemotelyLiving\PHPDNS\Entities\DNSRecordCollection;
+use RemotelyLiving\PHPDNS\Factories\SpatieDNS;
+use RemotelyLiving\PHPDNS\Mappers\Dig;
+use RemotelyLiving\PHPDNS\Observability\Subscribers\STDIOSubscriber;
+use RemotelyLiving\PHPDNS\Resolvers\Cached;
+use RemotelyLiving\PHPDNS\Resolvers\Chain;
+use RemotelyLiving\PHPDNS\Resolvers\CloudFlare;
+use RemotelyLiving\PHPDNS\Resolvers\GoogleDNS;
+use RemotelyLiving\PHPDNS\Resolvers\LocalSystem;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 
 class_alias(Hostname::class, 'Hostname');
 class_alias(DNSRecord::class, 'DNSRecord');
 class_alias(DNSRecordType::class, 'DNSRecordType');
 class_alias(DNSRecordCollection::class, 'DNSRecordCollection');
 
-$stdOut = new \SplFileObject('php://stdout');
-$stdErr = new \SplFileObject('php://stderr');
-$IOSubscriber = new \RemotelyLiving\PHPDNS\Observability\Subscribers\STDIOSubscriber($stdOut, $stdErr);
+$stdOut = new SplFileObject('php://stdout');
+$stdErr = new SplFileObject('php://stderr');
+$IOSubscriber = new STDIOSubscriber($stdOut, $stdErr);
 
-$localSystemResolver = new \RemotelyLiving\PHPDNS\Resolvers\LocalSystem();
+$localSystemResolver = new LocalSystem();
 $localSystemResolver->addSubscriber($IOSubscriber);
 
-$googleDNSResolver = new \RemotelyLiving\PHPDNS\Resolvers\GoogleDNS();
+$googleDNSResolver = new GoogleDNS();
 $googleDNSResolver->addSubscriber($IOSubscriber);
 
-$cloudFlareResolver = new \RemotelyLiving\PHPDNS\Resolvers\CloudFlare();
+$cloudFlareResolver = new CloudFlare();
 $cloudFlareResolver->addSubscriber($IOSubscriber);
 
-$digResolver = new \RemotelyLiving\PHPDNS\Resolvers\Dig(new \RemotelyLiving\PHPDNS\Factories\SpatieDNS(), new \RemotelyLiving\PHPDNS\Mappers\Dig());
+$digResolver = new \RemotelyLiving\PHPDNS\Resolvers\Dig(new SpatieDNS(), new Dig());
 $digResolver->addSubscriber($IOSubscriber);
 
-$chainResolver = new \RemotelyLiving\PHPDNS\Resolvers\Chain($cloudFlareResolver, $googleDNSResolver, $localSystemResolver);
-$cachedResolver = new \RemotelyLiving\PHPDNS\Resolvers\Cached(new \Symfony\Component\Cache\Adapter\FilesystemAdapter(), $chainResolver);
+$chainResolver = new Chain($cloudFlareResolver, $googleDNSResolver, $localSystemResolver);
+$cachedResolver = new Cached(new FilesystemAdapter(), $chainResolver);
 $cachedResolver->addSubscriber($IOSubscriber);

composer.json

@@ -16,7 +16,7 @@
         "ext-filter": "*",
         "ext-intl": "*",
         "ext-mbstring": "*",
-        "guzzlehttp/guzzle": "^6.0",
+        "guzzlehttp/guzzle": "^7.0 || ^6.0",
         "psr/cache": "^1.0",
         "symfony/event-dispatcher": "^5.0 || ^4.0 || ^3.0",
         "psr/log": "^1.0",