Merge pull request #40 from Crizz0/issue/39

Remove not needed services/parameter from cron/main.php

Author: Crizz0

config/services.yml

@@ -54,13 +54,8 @@ services:
     phpbbde.pastebin.cron.main:
         class: phpbbde\pastebin\cron\main
         arguments:
-            - '@cache'
             - '@config'
             - '@dbal.conn'
-            - '@log'
-            - '%phpbbde.pastebin.path%'
-            - '%core.root_path%'
-            - '%core.php_ext%'
             - '%phpbbde.pastebin.cron.prune_interval%'
             - '%tables.phpbbde.pastebin.pastebin%'
         calls:

cron/main.php

@@ -12,36 +12,23 @@
 
 class main extends \phpbb\cron\task\base
 {
-	/** @var string phpBB root path */
-	protected $root_path;
-
-	/** @var string phpEx */
-	protected $php_ext;
-
 	/** @var \phpbb\db\driver\driver_interface */
 	protected $db;
 
-	/** @var \phpbb\cache\service */
-	protected $cache;
-
 	/** @var \phpbb\config\config */
 	protected $config;
 
-	/** @var \phpbb\log\log_interface */
-	protected $log;
-	protected $pastebin_path;
 	protected $prune_interval;
 	protected $pastebin_table;
 
-	public function __construct(\phpbb\cache\service $cache, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\log\log_interface $log, $pastebin_path, $root_path, $php_ext, $prune_interval, $pastebin_table)
+	public function __construct(
+		\phpbb\config\config $config,
+		\phpbb\db\driver\driver_interface $db,
+		$prune_interval,
+		$pastebin_table)
 	{
-		$this->cache = $cache;
 		$this->config = $config;
 		$this->db = $db;
-		$this->log = $log;
-		$this->pastebin_path = $pastebin_path;
-		$this->root_path = $root_path;
-		$this->php_ext = $php_ext;
 		$this->prune_interval = $prune_interval;
 		$this->pastebin_table = $pastebin_table;
 	}

migrations/pastebin.php

@@ -12,14 +12,16 @@
 
 class pastebin extends \phpbb\db\migration\migration
 {
-	static public function depends_on()
+	public function effectively_installed()
 	{
-		return array();
+		return !empty($this->config['pastebin_version']) && version_compare($this->config['pastebin_version'], '0.2.2', '>=');
 	}
 
-	public function effectively_installed()
+	static public function depends_on()
 	{
-		return !empty($this->config['pastebin_version']) && version_compare($this->config['pastebin_version'], '0.2.2', '>=');
+		 return array(
+			'\phpbb\db\migration\data\v32x\v324',
+		);
 	}
 
 	public function update_schema()
@@ -65,16 +67,4 @@ public function update_data()
 				array('config.add', array('pastebin_version', '0.2.2')),
 		);
 	}
-
-	public function revert_data()
-	{
-		return array(
-				array('permission.remove', array('u_pastebin_view')),
-				array('permission.remove', array('u_pastebin_post')),
-				array('permission.remove', array('u_pastebin_post_novc')),
-				array('permission.remove', array('m_pastebin_edit')),
-				array('permission.remove', array('m_pastebin_delete')),
-				array('config.remove', array('pastebin_version')),
-		);
-	}
 }