PHP版本升级

Author: ahajason

.gitignore

@@ -1,3 +1,5 @@
 /composer.lock
 /vendor
-/.idea
+/.idea
+/.phpunit.result.cache
+/phpunit.xml

composer.json

@@ -1,26 +1,27 @@
 {
-    "type": "library",
-    "name": "codeages/rate-limiter",
-    "description": "Rate Limiting Library With Token Bucket Algorithm",
-    "require": {
-        "php": ">=5.3"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^4.8 || ^5.7 || ^6.0"
-    },
-    "suggest": {
-        "ext-redis": "^2.2"
-    },
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Codeages Team",
-            "email": "[email protected]"
-        }
-    ],
-    "autoload": {
-        "psr-4": {
-            "Codeages\\RateLimiter\\": "src/"
-        }
+  "type": "library",
+  "name": "codeages/rate-limiter",
+  "description": "Rate Limiting Library With Token Bucket Algorithm",
+  "require": {
+    "php": ">=7.3"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^8.5"
+  },
+  "suggest": {
+    "ext-redis": "^2.2",
+    "ext-pdo": "*"
+  },
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Codeages Team",
+      "email": "[email protected]"
     }
+  ],
+  "autoload": {
+    "psr-4": {
+      "Codeages\\RateLimiter\\": "src/"
+    }
+  }
 }

phpunit.xml.dist

@@ -10,7 +10,6 @@
     convertWarningsToExceptions = "true"
     processIsolation            = "false"
     stopOnFailure               = "false"
-    syntaxCheck                 = "false"
     bootstrap                   = "vendor/autoload.php" >
 
     <php>

tests/RateLimitTest.php renamed to tests/RateLimiterTest.php

@@ -18,7 +18,8 @@ public function testCheckRedis()
 
     public function testCheckMySQLPDO()
     {
-        $pdo = new PDO(getenv('MYSQL_DSN'), getenv('MYSQL_USER'), getenv('MYSQL_MYSQL_PASSWORD'));
+        $pdo = new PDO(getenv('MYSQL_DSN'), getenv('MYSQL_USER'), getenv('MYSQL_PASSWORD'));
+        $this->createMysqlTable($pdo);
         $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         $storage = new \Codeages\RateLimiter\Storage\MySQLPDOStorage($pdo);
         $this->check($storage);
@@ -38,7 +39,8 @@ public function testUpdateAllowanceRedis()
 
     public function testUpdateAllowanceMySQLPDO()
     {
-        $pdo = new PDO(getenv('MYSQL_DSN'), getenv('MYSQL_USER'), getenv('MYSQL_MYSQL_PASSWORD'));
+        $pdo = new PDO(getenv('MYSQL_DSN'), getenv('MYSQL_USER'), getenv('MYSQL_PASSWORD'));
+        $this->createMysqlTable($pdo);
         $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         $storage = new \Codeages\RateLimiter\Storage\MySQLPDOStorage($pdo);
         $this->updateAllowance($storage);
@@ -100,4 +102,22 @@ private function getRateLimiter(Storage $storage)
     {
         return new RateLimiter(self::NAME, self::MAX_REQUESTS, self::PERIOD, $storage);
     }
+
+    /**
+     * @param PDO $pdo
+     * @return void
+     */
+    private function createMysqlTable(PDO $pdo): void
+    {
+        $pdo->exec("
+            CREATE TABLE IF NOT EXISTS `ratelimit` (
+              `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+              `_key` varchar(128) NOT NULL,
+              `data` varchar(32) NOT NULL,
+              `deadline` int(10) unsigned NOT NULL,
+              PRIMARY KEY (`id`),
+              UNIQUE KEY `_key` (`_key`)
+            ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+        ");
+    }
 }