Merge pull request #6 from cluebotng/migrate-to-wikipedia-lib

Migrate to wikipedia lib
cluebotng · Oct 18, 2021 · 87fc757 · 87fc757
2 parents 486c07e + 5dbdd61
commit 87fc757
Show file tree

Hide file tree

Showing 7 changed files with 115 additions and 1,574 deletions.
diff --git a/cluebot3.php b/cluebot3.php
@@ -21,10 +21,6 @@
 
 namespace ClueBot3;
 
-require_once 'lib/http.php';
-require_once 'lib/wikipedia.api.php';
-require_once 'lib/wikipedia.index.php';
-require_once 'lib/wikipedia.query.php';
 require_once 'lib/bot.php';
 require_once 'cluebot3.config.php';
 
@@ -42,9 +38,10 @@
     )
 );
 
-$wpq = new WikipediaQuery();
-$wpi = new WikipediaIndex();
-$wpapi = new WikipediaApi();
+$wph = new \Wikipedia\Http($logger);
+$wpq = new \Wikipedia\Query($wph, $logger);
+$wpi = new \Wikipedia\Index($wph, $logger);
+$wpapi = new \Wikipedia\Api($wph, $logger);
 
 $wpapi->login($user, $pass);
 

diff --git a/composer.json b/composer.json
@@ -6,8 +6,15 @@
         "squizlabs/php_codesniffer": "@stable",
         "phpmd/phpmd" : "@stable"
     },
+    "repositories": [
+        {
+            "url": "https://github.com/cluebotng/wikipedia.git",
+            "type": "git"
+        }
+    ],
     "require": {
-        "monolog/monolog": "^1.17"
+        "monolog/monolog": "^1.17",
+        "cluebotng/wikipedia": "^v1.0.3"
     },
     "config": {
         "platform": {