Inspection of "68: Refactored the worker to docker and redis envi..." - janis91/ocr - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#93)

by Janis

created 2017-06-15 17:06 UTC

Status

Spacing +44 added lines, -44 removed lines patch added patch discarded remove patch

@@ -38,121 +38,121 @@  discard block
 block discarded – undo
 	 * @param array $urlParams        	
 	 */
 	public function __construct(array $urlParams = array()) {
-		parent::__construct ( 'ocr', $urlParams );
-		$container = $this->getContainer ();
+		parent::__construct('ocr', $urlParams);
+		$container = $this->getContainer();
 		
 		/**
 		 * Add the js and style if OCA\Files app is loaded
 		 */
-		$eventDispatcher = \OC::$server->getEventDispatcher ();
-		$eventDispatcher->addListener ( 'OCA\Files::loadAdditionalScripts', function () {
-			script ( 'ocr', 'dist/ocrapp' );
-			style ( 'ocr', 'ocrstyle' );
+		$eventDispatcher = \OC::$server->getEventDispatcher();
+		$eventDispatcher->addListener('OCA\Files::loadAdditionalScripts', function() {
+			script('ocr', 'dist/ocrapp');
+			style('ocr', 'ocrstyle');
 			// if not loaded before - load select2 for multi select languages
-			vendor_script ( 'select2/select2' );
-			vendor_style ( 'select2/select2' );
+			vendor_script('select2/select2');
+			vendor_style('select2/select2');
 		} );
 		
 		/**
 		 * Register core services
 		 */
-		$container->registerService ( 'CurrentUID', function (IContainer $c) {
+		$container->registerService('CurrentUID', function(IContainer $c) {
 			/** @var \OC\Server $server */
-			$server = $c->query ( 'ServerContainer' );
-			$user = $server->getUserSession ()->getUser ();
-			return ($user) ? $user->getUID () : '';
+			$server = $c->query('ServerContainer');
+			$user = $server->getUserSession()->getUser();
+			return ($user) ? $user->getUID() : '';
 		} );
 		
 		// Allow automatic DI for the View, until they migrated to Nodes API
-		$container->registerService ( View::class, function () {
-			return new View ( '' );
-		}, false );
+		$container->registerService(View::class, function() {
+			return new View('');
+		}, false);
 		
 		/**
 		 * Register the Ocr Job mapper
 		 */
-		$container->registerService ( 'OcrJobMapper', function (IContainer $c) {
+		$container->registerService('OcrJobMapper', function(IContainer $c) {
 			/** @var \OC\Server $server */
-			$server = $c->query ( 'ServerContainer' );
-			return new OcrJobMapper ( $server->getDatabaseConnection () );
+			$server = $c->query('ServerContainer');
+			return new OcrJobMapper($server->getDatabaseConnection());
 		} );
 		
 		/**
 		 * Register the File mapper
 		 */
-		$container->registerService ( 'FileMapper', function (IContainer $c) {
+		$container->registerService('FileMapper', function(IContainer $c) {
 			/** @var \OC\Server $server */
-			$server = $c->query ( 'ServerContainer' );
-			return new FileMapper ( $server->getDatabaseConnection () );
+			$server = $c->query('ServerContainer');
+			return new FileMapper($server->getDatabaseConnection());
 		} );
 		
 		/**
 		 * Register the Share mapper
 		 */
-		$container->registerService ( 'ShareMapper', function (IContainer $c) {
+		$container->registerService('ShareMapper', function(IContainer $c) {
 			/** @var \OC\Server $server */
-			$server = $c->query ( 'ServerContainer' );
-			return new ShareMapper ( $server->getDatabaseConnection () );
+			$server = $c->query('ServerContainer');
+			return new ShareMapper($server->getDatabaseConnection());
 		} );
 		
 		/**
 		 * Register the Queue Service
 		 */
-		$container->registerService ( 'RedisService', function (IAppContainer $c) {
+		$container->registerService('RedisService', function(IAppContainer $c) {
 			/** @var \OC\Server $server */
-			$server = $c->query ( 'ServerContainer' );
-			return new RedisService ( $c->query ( 'OcrJobMapper' ), $server->getConfig (), $server->getL10N ( 'ocr' ), $server->getLogger () );
+			$server = $c->query('ServerContainer');
+			return new RedisService($c->query('OcrJobMapper'), $server->getConfig(), $server->getL10N('ocr'), $server->getLogger());
 		} );
 		
 		/**
 		 * Register the Job Service
 		 */
-		$container->registerService ( 'FileService', function (IAppContainer $c) {
+		$container->registerService('FileService', function(IAppContainer $c) {
 			/** @var \OC\Server $server */
-			$server = $c->query ( 'ServerContainer' );
-			return new FileService ( $server->getL10N ( 'ocr' ), $server->getLogger (), $c->query ( 'CurrentUID' ), $c->query ( 'FileMapper' ), $c->query ( 'ShareMapper' ) );
+			$server = $c->query('ServerContainer');
+			return new FileService($server->getL10N('ocr'), $server->getLogger(), $c->query('CurrentUID'), $c->query('FileMapper'), $c->query('ShareMapper'));
 		} );
 		
 		/**
 		 * Register the Job Service
 		 */
-		$container->registerService ( 'JobService', function (IAppContainer $c) {
+		$container->registerService('JobService', function(IAppContainer $c) {
 			/** @var \OC\Server $server */
-			$server = $c->query ( 'ServerContainer' );
-			return new JobService ( $server->getL10N ( 'ocr' ), $server->getLogger (), $c->query ( 'CurrentUID' ), new View ( '/' . $c->query ( 'CurrentUID' ) . '/files' ), $server->getTempManager (), $c->query ( 'RedisService' ), $c->query ( 'OcrJobMapper' ), $c->query ( 'FileService' ) );
+			$server = $c->query('ServerContainer');
+			return new JobService($server->getL10N('ocr'), $server->getLogger(), $c->query('CurrentUID'), new View('/' . $c->query('CurrentUID') . '/files'), $server->getTempManager(), $c->query('RedisService'), $c->query('OcrJobMapper'), $c->query('FileService'));
 		} );
 		
 		/**
 		 * Register the Status Service
 		 */
-		$container->registerService ( 'StatusService', function (IAppContainer $c) {
+		$container->registerService('StatusService', function(IAppContainer $c) {
 			/** @var \OC\Server $server */
-			$server = $c->query ( 'ServerContainer' );
-			return new StatusService ( $server->getL10N ( 'ocr' ), $server->getLogger (), $c->query ( 'CurrentUID' ), $c->query ( 'OcrJobMapper' ), $c->query ( 'JobService' ) );
+			$server = $c->query('ServerContainer');
+			return new StatusService($server->getL10N('ocr'), $server->getLogger(), $c->query('CurrentUID'), $c->query('OcrJobMapper'), $c->query('JobService'));
 		} );
 		
 		/**
 		 * Controller
 		 */
-		$container->registerService ( 'StatusController', function (IAppContainer $c) {
+		$container->registerService('StatusController', function(IAppContainer $c) {
 			/** @var \OC\Server $server */
-			$server = $c->query ( 'ServerContainer' );
-			return new StatusController ( $c->getAppName (), $server->getRequest (), $c->query ( 'StatusService' ) );
+			$server = $c->query('ServerContainer');
+			return new StatusController($c->getAppName(), $server->getRequest(), $c->query('StatusService'));
 		} );
 		
 		/**
 		 * Controller
 		 */
-		$container->registerService ( 'JobController', function (IAppContainer $c) {
+		$container->registerService('JobController', function(IAppContainer $c) {
 			/** @var \OC\Server $server */
-			$server = $c->query ( 'ServerContainer' );
-			return new JobController ( $c->getAppName (), $server->getRequest (), $c->query ( 'JobService' ), $c->query ( 'CurrentUID' ) );
+			$server = $c->query('ServerContainer');
+			return new JobController($c->getAppName(), $server->getRequest(), $c->query('JobService'), $c->query('CurrentUID'));
 		} );
 		
 		/**
 		 * Controller
 		 */
-		$container->registerAlias ( 'PersonalSettingsController', PersonalSettingsController::class );
+		$container->registerAlias('PersonalSettingsController', PersonalSettingsController::class);
 	}
 	
 	/**
@@ -160,6 +160,6 @@  discard block
 block discarded – undo
 	 * @codeCoverageIgnore
 	 */
 	public function registerPersonal() {
-		\OCP\App::registerPersonal ( $this->getContainer ()->getAppName (), 'personal' );
+		\OCP\App::registerPersonal($this->getContainer()->getAppName(), 'personal');
 	}
 }

Please login to merge, or discard this patch.

		@@ -38,121 +38,121 @@ discard block
		block discarded – undo
38	38	* @param array $urlParams
39	39	*/
40	40	public function __construct(array $urlParams = array()) {
41		- parent::__construct ( 'ocr', $urlParams );
42		- $container = $this->getContainer ();
	41	+ parent::__construct('ocr', $urlParams);
	42	+ $container = $this->getContainer();
43	43
44	44	/**
45	45	* Add the js and style if OCA\Files app is loaded
46	46	*/
47		- $eventDispatcher = \OC::$server->getEventDispatcher ();
48		- $eventDispatcher->addListener ( 'OCA\Files::loadAdditionalScripts', function () {
49		- script ( 'ocr', 'dist/ocrapp' );
50		- style ( 'ocr', 'ocrstyle' );
	47	+ $eventDispatcher = \OC::$server->getEventDispatcher();
	48	+ $eventDispatcher->addListener('OCA\Files::loadAdditionalScripts', function() {
	49	+ script('ocr', 'dist/ocrapp');
	50	+ style('ocr', 'ocrstyle');
51	51	// if not loaded before - load select2 for multi select languages
52		- vendor_script ( 'select2/select2' );
53		- vendor_style ( 'select2/select2' );
	52	+ vendor_script('select2/select2');
	53	+ vendor_style('select2/select2');
54	54	} );
55	55
56	56	/**
57	57	* Register core services
58	58	*/
59		- $container->registerService ( 'CurrentUID', function (IContainer $c) {
	59	+ $container->registerService('CurrentUID', function(IContainer $c) {
60	60	/** @var \OC\Server $server */
61		- $server = $c->query ( 'ServerContainer' );
62		- $user = $server->getUserSession ()->getUser ();
63		- return ($user) ? $user->getUID () : '';
	61	+ $server = $c->query('ServerContainer');
	62	+ $user = $server->getUserSession()->getUser();
	63	+ return ($user) ? $user->getUID() : '';
64	64	} );
65	65
66	66	// Allow automatic DI for the View, until they migrated to Nodes API
67		- $container->registerService ( View::class, function () {
68		- return new View ( '' );
69		- }, false );
	67	+ $container->registerService(View::class, function() {
	68	+ return new View('');
	69	+ }, false);
70	70
71	71	/**
72	72	* Register the Ocr Job mapper
73	73	*/
74		- $container->registerService ( 'OcrJobMapper', function (IContainer $c) {
	74	+ $container->registerService('OcrJobMapper', function(IContainer $c) {
75	75	/** @var \OC\Server $server */
76		- $server = $c->query ( 'ServerContainer' );
77		- return new OcrJobMapper ( $server->getDatabaseConnection () );
	76	+ $server = $c->query('ServerContainer');
	77	+ return new OcrJobMapper($server->getDatabaseConnection());
78	78	} );
79	79
80	80	/**
81	81	* Register the File mapper
82	82	*/
83		- $container->registerService ( 'FileMapper', function (IContainer $c) {
	83	+ $container->registerService('FileMapper', function(IContainer $c) {
84	84	/** @var \OC\Server $server */
85		- $server = $c->query ( 'ServerContainer' );
86		- return new FileMapper ( $server->getDatabaseConnection () );
	85	+ $server = $c->query('ServerContainer');
	86	+ return new FileMapper($server->getDatabaseConnection());
87	87	} );
88	88
89	89	/**
90	90	* Register the Share mapper
91	91	*/
92		- $container->registerService ( 'ShareMapper', function (IContainer $c) {
	92	+ $container->registerService('ShareMapper', function(IContainer $c) {
93	93	/** @var \OC\Server $server */
94		- $server = $c->query ( 'ServerContainer' );
95		- return new ShareMapper ( $server->getDatabaseConnection () );
	94	+ $server = $c->query('ServerContainer');
	95	+ return new ShareMapper($server->getDatabaseConnection());
96	96	} );
97	97
98	98	/**
99	99	* Register the Queue Service
100	100	*/
101		- $container->registerService ( 'RedisService', function (IAppContainer $c) {
	101	+ $container->registerService('RedisService', function(IAppContainer $c) {
102	102	/** @var \OC\Server $server */
103		- $server = $c->query ( 'ServerContainer' );
104		- return new RedisService ( $c->query ( 'OcrJobMapper' ), $server->getConfig (), $server->getL10N ( 'ocr' ), $server->getLogger () );
	103	+ $server = $c->query('ServerContainer');
	104	+ return new RedisService($c->query('OcrJobMapper'), $server->getConfig(), $server->getL10N('ocr'), $server->getLogger());
105	105	} );
106	106
107	107	/**
108	108	* Register the Job Service
109	109	*/
110		- $container->registerService ( 'FileService', function (IAppContainer $c) {
	110	+ $container->registerService('FileService', function(IAppContainer $c) {
111	111	/** @var \OC\Server $server */
112		- $server = $c->query ( 'ServerContainer' );
113		- return new FileService ( $server->getL10N ( 'ocr' ), $server->getLogger (), $c->query ( 'CurrentUID' ), $c->query ( 'FileMapper' ), $c->query ( 'ShareMapper' ) );
	112	+ $server = $c->query('ServerContainer');
	113	+ return new FileService($server->getL10N('ocr'), $server->getLogger(), $c->query('CurrentUID'), $c->query('FileMapper'), $c->query('ShareMapper'));
114	114	} );
115	115
116	116	/**
117	117	* Register the Job Service
118	118	*/
119		- $container->registerService ( 'JobService', function (IAppContainer $c) {
	119	+ $container->registerService('JobService', function(IAppContainer $c) {
120	120	/** @var \OC\Server $server */
121		- $server = $c->query ( 'ServerContainer' );
122		- return new JobService ( $server->getL10N ( 'ocr' ), $server->getLogger (), $c->query ( 'CurrentUID' ), new View ( '/' . $c->query ( 'CurrentUID' ) . '/files' ), $server->getTempManager (), $c->query ( 'RedisService' ), $c->query ( 'OcrJobMapper' ), $c->query ( 'FileService' ) );
	121	+ $server = $c->query('ServerContainer');
	122	+ return new JobService($server->getL10N('ocr'), $server->getLogger(), $c->query('CurrentUID'), new View('/' . $c->query('CurrentUID') . '/files'), $server->getTempManager(), $c->query('RedisService'), $c->query('OcrJobMapper'), $c->query('FileService'));
123	123	} );
124	124
125	125	/**
126	126	* Register the Status Service
127	127	*/
128		- $container->registerService ( 'StatusService', function (IAppContainer $c) {
	128	+ $container->registerService('StatusService', function(IAppContainer $c) {
129	129	/** @var \OC\Server $server */
130		- $server = $c->query ( 'ServerContainer' );
131		- return new StatusService ( $server->getL10N ( 'ocr' ), $server->getLogger (), $c->query ( 'CurrentUID' ), $c->query ( 'OcrJobMapper' ), $c->query ( 'JobService' ) );
	130	+ $server = $c->query('ServerContainer');
	131	+ return new StatusService($server->getL10N('ocr'), $server->getLogger(), $c->query('CurrentUID'), $c->query('OcrJobMapper'), $c->query('JobService'));
132	132	} );
133	133
134	134	/**
135	135	* Controller
136	136	*/
137		- $container->registerService ( 'StatusController', function (IAppContainer $c) {
	137	+ $container->registerService('StatusController', function(IAppContainer $c) {
138	138	/** @var \OC\Server $server */
139		- $server = $c->query ( 'ServerContainer' );
140		- return new StatusController ( $c->getAppName (), $server->getRequest (), $c->query ( 'StatusService' ) );
	139	+ $server = $c->query('ServerContainer');
	140	+ return new StatusController($c->getAppName(), $server->getRequest(), $c->query('StatusService'));
141	141	} );
142	142
143	143	/**
144	144	* Controller
145	145	*/
146		- $container->registerService ( 'JobController', function (IAppContainer $c) {
	146	+ $container->registerService('JobController', function(IAppContainer $c) {
147	147	/** @var \OC\Server $server */
148		- $server = $c->query ( 'ServerContainer' );
149		- return new JobController ( $c->getAppName (), $server->getRequest (), $c->query ( 'JobService' ), $c->query ( 'CurrentUID' ) );
	148	+ $server = $c->query('ServerContainer');
	149	+ return new JobController($c->getAppName(), $server->getRequest(), $c->query('JobService'), $c->query('CurrentUID'));
150	150	} );
151	151
152	152	/**
153	153	* Controller
154	154	*/
155		- $container->registerAlias ( 'PersonalSettingsController', PersonalSettingsController::class );
	155	+ $container->registerAlias('PersonalSettingsController', PersonalSettingsController::class);
156	156	}
157	157
158	158	/**
		@@ -160,6 +160,6 @@ discard block
		block discarded – undo
160	160	* @codeCoverageIgnore
161	161	*/
162	162	public function registerPersonal() {
163		- \OCP\App::registerPersonal ( $this->getContainer ()->getAppName (), 'personal' );
	163	+ \OCP\App::registerPersonal($this->getContainer()->getAppName(), 'personal');
164	164	}
165	165	}

janis91 / ocr

Pull Request — master (#93)

Status

Category

Spacing +44 added lines, -44 removed lines patch added patch discarded remove patch