Merge pull request #267 from jeremykendall/bugfix/update-psl-script

BugFix composer loading for the update-psl script #265

Author: nyamsprod

bin/update-psl

@@ -18,7 +18,17 @@ use Pdp\Logger;
 use Pdp\Installer;
 use Pdp\Manager;
 
-require dirname(__DIR__).'/vendor/autoload.php';
+function get_vendor_path(): ?string
+{
+    for ($i = 1; $i <= 5; $i++) {
+        $vendor = dirname(__DIR__, $i).'/vendor';
+        if (is_dir($vendor) && file_exists($vendor.'/autoload.php')) {
+            return $vendor;
+        }
+    }
+
+    return null;
+}
 
 function writeln(array $messages, $output): int
 {
@@ -41,6 +51,20 @@ function fail(string $message, $output = STDERR): int
     return writeln($messages, $output);
 }
 
+$vendor = get_vendor_path();
+if (null === $vendor) {
+    $message = <<<TEXT
+        You must set up the project dependencies using composer
+        see https://getcomposer.org
+TEXT;
+
+    fail($message);
+
+    die(1);
+}
+
+require $vendor.'/autoload.php';
+
 /**
  * CLI colors
  */
@@ -72,7 +96,7 @@ if (isset($arguments['help']) || isset($arguments['h'])) {
     $helpText = <<<HELP
 {$yellow}Usage:$reset
     $script [options]
-    
+
 {$yellow}Options:$reset
     $green    --%s$reset                 refreshes the Public Suffix List cache
     $green    --%s=URL$reset         set the URL to use to refresh the PSL cache ({$yellow}default:$reset %s)
@@ -84,15 +108,15 @@ if (isset($arguments['help']) || isset($arguments['h'])) {
 
 {$yellow}Help:$reset
     The {$green}update-psl$reset command updates your PDP local cache.
-    
+
 {$yellow}Examples:$reset
 
      Refresh all caches using the default settings
      $green$script$reset
-     
-     Refresh only the PSL cache for a TTL of 3 DAY 
+
+     Refresh only the PSL cache for a TTL of 3 DAY
      $green$script --psl --ttl="3 DAYS"$reset
-     
+
      Refresh all caches using another cache directory
      $green$script --cache-dir=/temp$reset
 

composer.json

@@ -39,6 +39,7 @@
     "require": {
         "php": "^7.2.5",
         "ext-intl": "*",
+        "ext-json": "*",
         "psr/log": "^1.1",
         "psr/simple-cache": "^1.0.1"
     },

data/.gitignore

@@ -35,10 +35,7 @@ final class Converter implements PublicSuffixListSection
 {
     use IDNAConverterTrait;
 
-    /**
-     * @internal
-     */
-    const PSL_SECTION = [
+    private const PSL_SECTION = [
         'ICANN' => [
             'BEGIN' => self::ICANN_DOMAINS,
             'END' => '',
@@ -49,10 +46,7 @@ final class Converter implements PublicSuffixListSection
         ],
     ];
 
-    /**
-     * @internal
-     */
-    const REGEX_PSL_SECTION = ',^// ===(?<point>BEGIN|END) (?<type>ICANN|PRIVATE) DOMAINS===,';
+    private const REGEX_PSL_SECTION = ',^// ===(?<point>BEGIN|END) (?<type>ICANN|PRIVATE) DOMAINS===,';
 
     /**
      * Convert the Public Suffix List into

data/pdp-PSL_FULL_5a3cc7f81795bb2e48e848af42d287b4.cache

@@ -54,10 +54,7 @@ final class Domain implements DomainInterface, JsonSerializable
 {
     use IDNAConverterTrait;
 
-    /**
-     * @internal
-     */
-    const REGEXP_IDN_PATTERN = '/[^\x20-\x7f]/';
+    private const REGEXP_IDN_PATTERN = '/[^\x20-\x7f]/';
 
     /**
      * @var string|null

data/pdp-RZD_FULL_f18a70477d29d525b9220612e2115345.cache

@@ -26,7 +26,7 @@
 
 final class Logger extends AbstractLogger
 {
-    const ERRORS_LEVELS = [
+    private const ERRORS_LEVELS = [
         LogLevel::EMERGENCY => 1,
         LogLevel::ALERT => 1,
         LogLevel::CRITICAL => 1,

src/Converter.php

@@ -49,8 +49,8 @@
  */
 final class Manager
 {
-    const PSL_URL = 'https://publicsuffix.org/list/public_suffix_list.dat';
-    const RZD_URL = 'https://data.iana.org/TLD/tlds-alpha-by-domain.txt';
+    public const PSL_URL = 'https://publicsuffix.org/list/public_suffix_list.dat';
+    public const RZD_URL = 'https://data.iana.org/TLD/tlds-alpha-by-domain.txt';
 
     /**
      * @var CacheInterface

src/Domain.php

@@ -44,10 +44,7 @@ final class PublicSuffix implements DomainInterface, JsonSerializable, PublicSuf
 {
     use IDNAConverterTrait;
 
-    /**
-     * @internal
-     */
-    const PSL_SECTION = [self::PRIVATE_DOMAINS, self::ICANN_DOMAINS, ''];
+    private const PSL_SECTION = [self::PRIVATE_DOMAINS, self::ICANN_DOMAINS, ''];
 
     /**
      * @var string|null