- Moves Env class's error handling to the Initializer class

lib/Config/Env.php

@@ -72,7 +72,7 @@ class Env {
     if(!is_dir($path)) {
       @mkdir($path);
       if(!is_dir($path)) {
-        throw new \Exception(__("The plugin requires a writeable WordPress uploads folder."));
+        throw new \Exception(__("Failed to create a temporary folder inside the WordPress's uploads folder."));
       }
       file_put_contents(
         $path . '/index.php',

lib/Config/Initializer.php

@@ -18,7 +18,11 @@ class Initializer {
     'file' => '',
     'version' => '1.0.0'
   )) {
+    try {
       Env::init($params['file'], $params['version']);
+    } catch(\Exception $e) {
+      $this->handleFailedInitialization($e->getMessage());
+    }
   }
 
   function init() {
@@ -110,7 +114,7 @@ class Initializer {
 
       $this->plugin_initialized = true;
     } catch(\Exception $e) {
-      self::handleFailedInitialization($e);
+      $this->handleFailedInitialization($e);
     }
   }
 
@@ -207,7 +211,7 @@ class Initializer {
     add_image_size('mailpoet_newsletter_max', 1320);
   }
 
-  static function handleFailedInitialization($message) {
+  function handleFailedInitialization($message) {
     return WPNotice::displayError($message);
   }
 }

mailpoet.php

@@ -1,8 +1,7 @@
 <?php
 if(!defined('ABSPATH')) exit;
 
-use MailPoet\Config\Initializer;
+use \MailPoet\Config\Initializer;
-
 /*
  * Plugin Name: MailPoet
  * Version: 3.0.0-beta.3
@@ -22,15 +21,11 @@ use MailPoet\Config\Initializer;
  */
 
 require 'vendor/autoload.php';
+
 define('MAILPOET_VERSION', '3.0.0-beta.3');
-try {
+
-  $initializer = new Initializer(
+$initializer = new Initializer(array(
-    array(
   'file' => __FILE__,
   'version' => MAILPOET_VERSION
-    )
+));
-  );
+$initializer->init();
-  $initializer->init();
-} catch(\Exception $e) {
-  Initializer::handleFailedInitialization($e->getMessage());
-}