Fix #248 , Fix #266 upgrader_process_complete is not ideal

hyyan · hyyan · commit 01bc5b2d3df1 · 2017-12-08T07:54:54.000+01:00
diff --git a/src/Hyyan/WPI/Plugin.php b/src/Hyyan/WPI/Plugin.php
@@ -17,8 +17,7 @@
  *
  * @author Hyyan Abo Fakher <hyyanaf@gmail.com>
  */
-class Plugin
-{
+class Plugin {
 
     /** Required woocommerce version */
     const WOOCOMMERCE_VERSION = '3.0.0';
@@ -29,20 +28,17 @@ class Plugin
     /**
      * Construct the plugin.
      */
-    public function __construct()
-    {
+    public function __construct() {
         FlashMessages::register();
 
         add_action('init', array($this, 'activate'));
         add_action('plugins_loaded', array($this, 'loadTextDomain'));
-        add_action('upgrader_process_complete', array($this, 'onUpgrade'), 10, 2);
     }
 
     /**
      * Load plugin langauge file.
      */
-    public function loadTextDomain()
-    {
+    public function loadTextDomain() {
         load_plugin_textdomain(
                 'woo-poly-integration', false, plugin_basename(dirname(Hyyan_WPI_DIR)) . '/languages'
         );
@@ -56,9 +52,8 @@ public function loadTextDomain()
      *
      * @return bool false if plugin can not be activated
      */
-    public function activate()
-    {
-        
+    public function activate() {
+
         if (!static::canActivate()) {
             FlashMessages::remove(MessagesInterface::MSG_SUPPORT);
             FlashMessages::add(
@@ -88,7 +83,14 @@ public function activate()
 
             return $settingsLinks + $links;
         });
+
         add_filter('plugin_row_meta', array(__CLASS__, 'plugin_row_meta'), 10, 2);
+        
+        $oldVersion = get_option('wpi_version');
+        if (version_compare(self::getVersion(), $oldVersion, '<>')) {
+            $this->onUpgrade(self::getVersion(), $oldVersion);
+            update_option('wpi_version', self::getVersion());
+        }
 
         $this->registerCore();
     }
@@ -98,8 +100,7 @@ public function activate()
      *
      * @return bool true if can be activated , false otherwise
      */
-    public static function canActivate()
-    {
+    public static function canActivate() {
         $polylang = false;
         $woocommerce = false;
 
@@ -133,38 +134,25 @@ public static function canActivate()
         return ($polylang && Utilities::polylangVersionCheck(self::POLYLANG_VERSION)) &&
                 ($woocommerce && Utilities::woocommerceVersionCheck(self::WOOCOMMERCE_VERSION));
     }
-    
+
     /**
      * On Upgrade
-     *
-     * Run only once the plugin has been updated to a new version
-     *
-     * @param \Plugin_Upgrader $upgrader
-     * @param Array $options
+     * 
+     * Run on the plugin updates only once
+     * 
+     * @param num $newVersion
+     * @param num $oldVersion
      */
-    public function onUpgrade($upgrader, $options)
-    {
-        $woopoly = 'woo-poly-integration/__init__.php';
-        
-        if (
-                $options['action'] == 'update' &&
-                ($options['type'] == 'plugin' && isset($options['plugins']))
-        ) {
-            foreach ($options['plugins'] as $plugin) {
-                if ($plugin == $woopoly) {
-                    flush_rewrite_rules();
-                }
-            }
-        }
+    public function onUpgrade($newVersion, $oldVersion) {
+        flush_rewrite_rules(true);
     }
 
     /**
      * Get current plugin version.
      *
      * @return int
      */
-    public static function getVersion()
-    {
+    public static function getVersion() {
         $data = get_plugin_data(Hyyan_WPI_DIR);
 
         return $data['Version'];
@@ -178,8 +166,7 @@ public static function getVersion()
      *
      * @return string the view content
      */
-    public static function getView($name, array $vars = array())
-    {
+    public static function getView($name, array $vars = array()) {
         $result = '';
         $path = dirname(Hyyan_WPI_DIR) . '/src/Hyyan/WPI/Views/' . $name . '.php';
         if (file_exists($path)) {
@@ -194,8 +181,7 @@ public static function getView($name, array $vars = array())
     /**
      * Add plugin core classes.
      */
-    protected function registerCore()
-    {
+    protected function registerCore() {
         new Emails();
         new Admin\Settings();
         new Cart();
@@ -228,8 +214,7 @@ protected function registerCore()
      * @param	mixed $file  Plugin Base file
      * @return	array
      */
-    public static function plugin_row_meta($links, $file)
-    {
+    public static function plugin_row_meta($links, $file) {
         if ('woo-poly-integration/__init__.php' == $file) {
             $row_meta = array(
                 'docs' => '<a target="_blank" href="https://github.com/hyyan/woo-poly-integration/wiki"'
@@ -244,4 +229,5 @@ public static function plugin_row_meta($links, $file)
 
         return (array) $links;
     }
+
 }
