Inspection of "Remove old timer" - adumitru68/QueryBuilder - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 289635...077925 )

by Adrian

created 2019-02-23 09:50 UTC

Status

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

@@ -26,12 +26,12 @@  discard block
 block discarded – undo
 	 * @return $this
 	 * @throws QueryException
 	 */
-	public function orderBy( $column, array $allowedColumns = [] )
+	public function orderBy( $column, array $allowedColumns = [ ] )
 	{
 		if ( !$this->validateColumn( $column, $allowedColumns ) )
 			throw new QueryException( 'Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
 
-		$column = $this->queryStructure->prepare($column);
+		$column = $this->queryStructure->prepare( $column );
 		$this->queryStructure->setElement( QueryStructure::ORDER_BY, $column );
 
 		return $this;
@@ -44,12 +44,12 @@  discard block
 block discarded – undo
 	 * @return $this
 	 * @throws QueryException
 	 */
-	public function orderByDesc( $column, array $allowedColumns = [] )
+	public function orderByDesc( $column, array $allowedColumns = [ ] )
 	{
 		if ( !$this->validateColumn( $column, $allowedColumns ) )
 			throw new QueryException( 'Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
 
-		$column = $this->queryStructure->prepare($column);
+		$column = $this->queryStructure->prepare( $column );
 		$this->queryStructure->setElement( QueryStructure::ORDER_BY, $column . ' DESC' );
 
 		return $this;

Please login to merge, or discard this patch.

Braces +9 added lines, -6 removed lines patch added patch discarded remove patch

@@ -28,8 +28,9 @@  discard block
 block discarded – undo
 	 */
 	public function orderBy( $column, array $allowedColumns = [] )
 	{
-		if ( !$this->validateColumn( $column, $allowedColumns ) )
-			throw new QueryException( 'Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
+		if ( !$this->validateColumn( $column, $allowedColumns ) ) {
+					throw new QueryException( 'Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
+		}
 
 		$column = $this->queryStructure->prepare($column);
 		$this->queryStructure->setElement( QueryStructure::ORDER_BY, $column );
@@ -46,8 +47,9 @@  discard block
 block discarded – undo
 	 */
 	public function orderByDesc( $column, array $allowedColumns = [] )
 	{
-		if ( !$this->validateColumn( $column, $allowedColumns ) )
-			throw new QueryException( 'Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
+		if ( !$this->validateColumn( $column, $allowedColumns ) ) {
+					throw new QueryException( 'Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
+		}
 
 		$column = $this->queryStructure->prepare($column);
 		$this->queryStructure->setElement( QueryStructure::ORDER_BY, $column . ' DESC' );
@@ -74,8 +76,9 @@  discard block
 block discarded – undo
 	 */
 	private function getOrderBySyntax()
 	{
-		if ( count( $this->queryStructure->getElement( QueryStructure::ORDER_BY ) ) )
-			return 'ORDER BY ' . QueryHelper::implode( $this->queryStructure->getElement( QueryStructure::ORDER_BY ), ', ' );
+		if ( count( $this->queryStructure->getElement( QueryStructure::ORDER_BY ) ) ) {
+					return 'ORDER BY ' . QueryHelper::implode( $this->queryStructure->getElement( QueryStructure::ORDER_BY ), ', ' );
+		}
 
 		return '';
 	}

Please login to merge, or discard this patch.

src/Traits/ColumnValidation.php 1 patch

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch

@@ -26,11 +26,13 @@
 block discarded – undo
 	 */
 	protected function validateColumn( $columnName, array $allowed )
 	{
-		if ( is_integer( $columnName ) )
-			return true;
+		if ( is_integer( $columnName ) ) {
+					return true;
+		}
 
-		if ( !count( $allowed ) )
-			return true;
+		if ( !count( $allowed ) ) {
+					return true;
+		}
 
 		return false;
 	}

Please login to merge, or discard this patch.

src/Traits/GroupBy.php 2 patches

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

@@ -26,12 +26,12 @@  discard block
 block discarded – undo
 	 * @return $this
 	 * @throws QueryException
 	 */
-	public function groupBy( $column, array $allowedColumns = [] )
+	public function groupBy( $column, array $allowedColumns = [ ] )
 	{
 		if ( !$this->validateColumn( $column, $allowedColumns ) )
 			throw new QueryException( 'Invalid column name in GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
 
-		$column = $this->queryStructure->prepare($column);
+		$column = $this->queryStructure->prepare( $column );
 		$this->queryStructure->setElement( QueryStructure::ORDER_BY, $column );
 
 		$this->queryStructure->setElement( QueryStructure::GROUP_BY, $column );
@@ -46,12 +46,12 @@  discard block
 block discarded – undo
 	 * @return $this
 	 * @throws QueryException
 	 */
-	public function groupByDesc( $column, array $allowedColumns = [] )
+	public function groupByDesc( $column, array $allowedColumns = [ ] )
 	{
 		if ( !$this->validateColumn( $column, $allowedColumns ) )
 			throw new QueryException( 'Invalid column name in GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
 
-		$column = $this->queryStructure->prepare($column);
+		$column = $this->queryStructure->prepare( $column );
 		$this->queryStructure->setElement( QueryStructure::ORDER_BY, $column );
 
 		$this->queryStructure->setElement( QueryStructure::GROUP_BY, $column . ' DESC' );

Please login to merge, or discard this patch.

Braces +9 added lines, -6 removed lines patch added patch discarded remove patch

@@ -28,8 +28,9 @@  discard block
 block discarded – undo
 	 */
 	public function groupBy( $column, array $allowedColumns = [] )
 	{
-		if ( !$this->validateColumn( $column, $allowedColumns ) )
-			throw new QueryException( 'Invalid column name in GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
+		if ( !$this->validateColumn( $column, $allowedColumns ) ) {
+					throw new QueryException( 'Invalid column name in GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
+		}
 
 		$column = $this->queryStructure->prepare($column);
 		$this->queryStructure->setElement( QueryStructure::ORDER_BY, $column );
@@ -48,8 +49,9 @@  discard block
 block discarded – undo
 	 */
 	public function groupByDesc( $column, array $allowedColumns = [] )
 	{
-		if ( !$this->validateColumn( $column, $allowedColumns ) )
-			throw new QueryException( 'Invalid column name in GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
+		if ( !$this->validateColumn( $column, $allowedColumns ) ) {
+					throw new QueryException( 'Invalid column name in GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
+		}
 
 		$column = $this->queryStructure->prepare($column);
 		$this->queryStructure->setElement( QueryStructure::ORDER_BY, $column );
@@ -78,8 +80,9 @@  discard block
 block discarded – undo
 	 */
 	private function getGroupBySyntax()
 	{
-		if ( count( $this->queryStructure->getElement( QueryStructure::GROUP_BY ) ) )
-			return 'GROUP BY ' . QueryHelper::implode( $this->queryStructure->getElement( QueryStructure::GROUP_BY ), ', ' );
+		if ( count( $this->queryStructure->getElement( QueryStructure::GROUP_BY ) ) ) {
+					return 'GROUP BY ' . QueryHelper::implode( $this->queryStructure->getElement( QueryStructure::GROUP_BY ), ', ' );
+		}
 
 		return '';
 	}

Please login to merge, or discard this patch.

		@@ -26,12 +26,12 @@ discard block
		block discarded – undo
26	26	* @return $this
27	27	* @throws QueryException
28	28	*/
29		- public function orderBy( $column, array $allowedColumns = [] )
	29	+ public function orderBy( $column, array $allowedColumns = [ ] )
30	30	{
31	31	if ( !$this->validateColumn( $column, $allowedColumns ) )
32	32	throw new QueryException( 'Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
33	33
34		- $column = $this->queryStructure->prepare($column);
	34	+ $column = $this->queryStructure->prepare( $column );
35	35	$this->queryStructure->setElement( QueryStructure::ORDER_BY, $column );
36	36
37	37	return $this;
		@@ -44,12 +44,12 @@ discard block
		block discarded – undo
44	44	* @return $this
45	45	* @throws QueryException
46	46	*/
47		- public function orderByDesc( $column, array $allowedColumns = [] )
	47	+ public function orderByDesc( $column, array $allowedColumns = [ ] )
48	48	{
49	49	if ( !$this->validateColumn( $column, $allowedColumns ) )
50	50	throw new QueryException( 'Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
51	51
52		- $column = $this->queryStructure->prepare($column);
	52	+ $column = $this->queryStructure->prepare( $column );
53	53	$this->queryStructure->setElement( QueryStructure::ORDER_BY, $column . ' DESC' );
54	54
55	55	return $this;

		@@ -28,8 +28,9 @@ discard block
		block discarded – undo
28	28	*/
29	29	public function orderBy( $column, array $allowedColumns = [] )
30	30	{
31		- if ( !$this->validateColumn( $column, $allowedColumns ) )
32		- throw new QueryException( 'Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
	31	+ if ( !$this->validateColumn( $column, $allowedColumns ) ) {
	32	+ throw new QueryException( 'Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
	33	+ }
33	34
34	35	$column = $this->queryStructure->prepare($column);
35	36	$this->queryStructure->setElement( QueryStructure::ORDER_BY, $column );
		@@ -46,8 +47,9 @@ discard block
		block discarded – undo
46	47	*/
47	48	public function orderByDesc( $column, array $allowedColumns = [] )
48	49	{
49		- if ( !$this->validateColumn( $column, $allowedColumns ) )
50		- throw new QueryException( 'Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
	50	+ if ( !$this->validateColumn( $column, $allowedColumns ) ) {
	51	+ throw new QueryException( 'Invalid column name in ORDER BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
	52	+ }
51	53
52	54	$column = $this->queryStructure->prepare($column);
53	55	$this->queryStructure->setElement( QueryStructure::ORDER_BY, $column . ' DESC' );
		@@ -74,8 +76,9 @@ discard block
		block discarded – undo
74	76	*/
75	77	private function getOrderBySyntax()
76	78	{
77		- if ( count( $this->queryStructure->getElement( QueryStructure::ORDER_BY ) ) )
78		- return 'ORDER BY ' . QueryHelper::implode( $this->queryStructure->getElement( QueryStructure::ORDER_BY ), ', ' );
	79	+ if ( count( $this->queryStructure->getElement( QueryStructure::ORDER_BY ) ) ) {
	80	+ return 'ORDER BY ' . QueryHelper::implode( $this->queryStructure->getElement( QueryStructure::ORDER_BY ), ', ' );
	81	+ }
79	82
80	83	return '';
81	84	}

		@@ -26,11 +26,13 @@
		block discarded – undo
26	26	*/
27	27	protected function validateColumn( $columnName, array $allowed )
28	28	{
29		- if ( is_integer( $columnName ) )
30		- return true;
	29	+ if ( is_integer( $columnName ) ) {
	30	+ return true;
	31	+ }
31	32
32		- if ( !count( $allowed ) )
33		- return true;
	33	+ if ( !count( $allowed ) ) {
	34	+ return true;
	35	+ }
34	36
35	37	return false;
36	38	}

		@@ -28,8 +28,9 @@ discard block
		block discarded – undo
28	28	*/
29	29	public function groupBy( $column, array $allowedColumns = [] )
30	30	{
31		- if ( !$this->validateColumn( $column, $allowedColumns ) )
32		- throw new QueryException( 'Invalid column name in GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
	31	+ if ( !$this->validateColumn( $column, $allowedColumns ) ) {
	32	+ throw new QueryException( 'Invalid column name in GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
	33	+ }
33	34
34	35	$column = $this->queryStructure->prepare($column);
35	36	$this->queryStructure->setElement( QueryStructure::ORDER_BY, $column );
		@@ -48,8 +49,9 @@ discard block
		block discarded – undo
48	49	*/
49	50	public function groupByDesc( $column, array $allowedColumns = [] )
50	51	{
51		- if ( !$this->validateColumn( $column, $allowedColumns ) )
52		- throw new QueryException( 'Invalid column name in GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
	52	+ if ( !$this->validateColumn( $column, $allowedColumns ) ) {
	53	+ throw new QueryException( 'Invalid column name in GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME );
	54	+ }
53	55
54	56	$column = $this->queryStructure->prepare($column);
55	57	$this->queryStructure->setElement( QueryStructure::ORDER_BY, $column );
		@@ -78,8 +80,9 @@ discard block
		block discarded – undo
78	80	*/
79	81	private function getGroupBySyntax()
80	82	{
81		- if ( count( $this->queryStructure->getElement( QueryStructure::GROUP_BY ) ) )
82		- return 'GROUP BY ' . QueryHelper::implode( $this->queryStructure->getElement( QueryStructure::GROUP_BY ), ', ' );
	83	+ if ( count( $this->queryStructure->getElement( QueryStructure::GROUP_BY ) ) ) {
	84	+ return 'GROUP BY ' . QueryHelper::implode( $this->queryStructure->getElement( QueryStructure::GROUP_BY ), ', ' );
	85	+ }
83	86
84	87	return '';
85	88	}

adumitru68 / QueryBuilder

Push — master ( 289635...077925 )

Status

Category

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

Braces +9 added lines, -6 removed lines patch added patch discarded remove patch

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch

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

Braces +9 added lines, -6 removed lines patch added patch discarded remove patch