Package core moved to php-imap

Webklex · Sep 22, 2020 · d01caf1 · d01caf1
1 parent 3391e8a
commit d01caf1
Show file tree

Hide file tree

Showing 39 changed files with 37 additions and 5,444 deletions.
diff --git a/composer.json b/composer.json
@@ -20,15 +20,15 @@
     ],
     "require": {
         "php": ">=5.5.9",
-        "ext-imap": "*",
         "ext-mbstring": "*",
         "ext-iconv": "*",
         "ext-fileinfo": "*",
+        "webklex/php-imap": "^2.1",
         "laravel/framework": ">=5.0.0"
     },
     "autoload": {
         "psr-4": {
-            "Webklex\\IMAP\\": "src/IMAP"
+            "Webklex\\IMAP\\": "src"
         }
     },
     "scripts": {

diff --git a/examples/custom_attachment_mask.php b/examples/custom_attachment_mask.php
@@ -10,7 +10,7 @@
 *  -
 */
 
-class CustomAttachmentMask extends \Webklex\IMAP\Support\Masks\AttachmentMask {
+class CustomAttachmentMask extends \Webklex\PHPIMAP\Support\Masks\AttachmentMask {
 
     /**
      * New custom method which can be called through a mask
@@ -35,18 +35,18 @@ public function custom_save() {
 
 }
 
-/** @var \Webklex\IMAP\Client $oClient */
+/** @var \Webklex\PHPIMAP\Client $oClient */
 $oClient = \Webklex\IMAP\Facades\Client::account('default');
 $oClient->connect();
 $oClient->setDefaultAttachmentMask(CustomAttachmentMask::class);
 
-/** @var \Webklex\IMAP\Folder $folder */
+/** @var \Webklex\PHPIMAP\Folder $folder */
 $folder = $oClient->getFolder('INBOX');
 
-/** @var \Webklex\IMAP\Message $message */
+/** @var \Webklex\PHPIMAP\Message $message */
 $message = $folder->query()->limit(1)->get()->first();
 
-/** @var \Webklex\IMAP\Attachment $attachment */
+/** @var \Webklex\PHPIMAP\Attachment $attachment */
 $attachment = $message->getAttachments()->first();
 
 /** @var CustomAttachmentMask $masked_attachment */

diff --git a/examples/custom_message_mask.php b/examples/custom_message_mask.php
@@ -10,7 +10,7 @@
 *  -
 */
 
-class CustomMessageMask extends \Webklex\IMAP\Support\Masks\MessageMask {
+class CustomMessageMask extends \Webklex\PHPIMAP\Support\Masks\MessageMask {
 
     /**
      * New custom method which can be called through a mask
@@ -30,14 +30,14 @@ public function getAttachmentCount() {
 
 }
 
-/** @var \Webklex\IMAP\Client $oClient */
+/** @var \Webklex\PHPIMAP\Client $oClient */
 $oClient = \Webklex\IMAP\Facades\Client::account('default');
 $oClient->connect();
 
-/** @var \Webklex\IMAP\Folder $folder */
+/** @var \Webklex\PHPIMAP\Folder $folder */
 $folder = $oClient->getFolder('INBOX');
 
-/** @var \Webklex\IMAP\Message $message */
+/** @var \Webklex\PHPIMAP\Message $message */
 $message = $folder->query()->limit(1)->get()->first();
 
 /** @var CustomMessageMask $masked_message */

diff --git a/examples/folder_structure.blade.php b/examples/folder_structure.blade.php
@@ -11,8 +11,8 @@
  */
 
 /**
- * @var \Webklex\IMAP\Support\FolderCollection $paginator
- * @var \Webklex\IMAP\Folder $oFolder
+ * @var \Webklex\PHPIMAP\Support\FolderCollection $paginator
+ * @var \Webklex\PHPIMAP\Folder $oFolder
  */
 
 ?>

diff --git a/examples/message_table.blade.php b/examples/message_table.blade.php
@@ -11,8 +11,8 @@
  */
 
 /**
- * @var \Webklex\IMAP\Support\MessageCollection $paginator
- * @var \Webklex\IMAP\Message $oMessage
+ * @var \Webklex\PHPIMAP\Support\MessageCollection $paginator
+ * @var \Webklex\PHPIMAP\Message $oMessage
  */
 
 ?>

diff --git a/examples/replace_images_with_url.php b/examples/replace_images_with_url.php
diff --git a/src/IMAP/ClientManager.php → src/ClientManager.php b/src/IMAP/ClientManager.php → src/ClientManager.php
@@ -12,6 +12,11 @@
 
 namespace Webklex\IMAP;
 
+use Illuminate\Foundation\Application;
+use Webklex\PHPIMAP\Client;
+use Webklex\PHPIMAP\ClientManager as CM;
+use Webklex\PHPIMAP\Exceptions\MaskNotFoundException;
+
 /**
  * Class ClientManager
  *
@@ -24,7 +29,7 @@ class ClientManager {
     /**
      * The application instance.
      *
-     * @var \Illuminate\Foundation\Application
+     * @var Application
      */
     protected $app;
 
@@ -36,19 +41,19 @@ class ClientManager {
     /**
      * Create a new client manager instance.
      *
-     * @param  \Illuminate\Foundation\Application  $app
+     * @param  Application  $app
      */
     public function __construct($app) {
         $this->app = $app;
+        CM::$config = $this->app['config']["imap"];
     }
 
     /**
      * Resolve a account instance.
-     *
      * @param  string  $name
      *
      * @return Client
-     * @throws Exceptions\MaskNotFoundException
+     * @throws MaskNotFoundException
      */
     public function account($name = null) {
         $name = $name ?: $this->getDefaultAccount();
@@ -68,7 +73,7 @@ public function account($name = null) {
      * @param  string  $name
      *
      * @return Client
-     * @throws Exceptions\MaskNotFoundException
+     * @throws MaskNotFoundException
      */
     protected function resolve($name) {
         $config = $this->getConfig($name);
@@ -109,16 +114,17 @@ public function getDefaultAccount() {
      */
     public function setDefaultAccount($name) {
         $this->app['config']['imap.default'] = $name;
+        CM::$config['config']['default'] = $name;
     }
 
     /**
      * Dynamically pass calls to the default account.
      *
-     * @param  string  $method
-     * @param  array   $parameters
+     * @param string $method
+     * @param array $parameters
      *
      * @return mixed
-     * @throws Exceptions\MaskNotFoundException
+     * @throws MaskNotFoundException
      */
     public function __call($method, $parameters) {
         $callable = [$this->account(), $method];

diff --git a/src/IMAP/Facades/Client.php → src/Facades/Client.php b/src/IMAP/Facades/Client.php → src/Facades/Client.php