nextcloud / server

lib/private/AppFramework/OCS/V1Response.php

Indentation +41 added lines, -41 removed lines

@@ -27,52 +27,52 @@
 
 class V1Response extends BaseResponse {
 
-	/**
-	 * The V1 endpoint has very limited http status codes basically everything
-	 * is status 200 except 401
-	 *
-	 * @return int
-	 */
-	public function getStatus() {
-		$status  = parent::getStatus();
-		if ($status === Http::STATUS_FORBIDDEN || $status === API::RESPOND_UNAUTHORISED) {
-			return Http::STATUS_UNAUTHORIZED;
-		}
+    /**
+     * The V1 endpoint has very limited http status codes basically everything
+     * is status 200 except 401
+     *
+     * @return int
+     */
+    public function getStatus() {
+        $status  = parent::getStatus();
+        if ($status === Http::STATUS_FORBIDDEN || $status === API::RESPOND_UNAUTHORISED) {
+            return Http::STATUS_UNAUTHORIZED;
+        }
 
-		return Http::STATUS_OK;
-	}
+        return Http::STATUS_OK;
+    }
 
-	/**
-	 * In v1 all OK is 100
-	 *
-	 * @return int
-	 */
-	public function getOCSStatus() {
-		$status = parent::getOCSStatus();
+    /**
+     * In v1 all OK is 100
+     *
+     * @return int
+     */
+    public function getOCSStatus() {
+        $status = parent::getOCSStatus();
 
-		if ($status === Http::STATUS_OK) {
-			return 100;
-		}
+        if ($status === Http::STATUS_OK) {
+            return 100;
+        }
 
-		return $status;
-	}
+        return $status;
+    }
 
-	/**
-	 * Construct the meta part of the response
-	 * And then late the base class render
-	 *
-	 * @return string
-	 */
-	public function render() {
-		$meta = [
-			'status' => $this->getOCSStatus() === 100 ? 'ok' : 'failure',
-			'statuscode' => $this->getOCSStatus(),
-			'message' => $this->getOCSStatus() === 100 ? 'OK' : $this->statusMessage,
-		];
+    /**
+     * Construct the meta part of the response
+     * And then late the base class render
+     *
+     * @return string
+     */
+    public function render() {
+        $meta = [
+            'status' => $this->getOCSStatus() === 100 ? 'ok' : 'failure',
+            'statuscode' => $this->getOCSStatus(),
+            'message' => $this->getOCSStatus() === 100 ? 'OK' : $this->statusMessage,
+        ];
 
-		$meta['totalitems'] = $this->itemsCount !== null ? (string)$this->itemsCount : '';
-		$meta['itemsperpage'] = $this->itemsPerPage !== null ? (string)$this->itemsPerPage: '';
+        $meta['totalitems'] = $this->itemsCount !== null ? (string)$this->itemsCount : '';
+        $meta['itemsperpage'] = $this->itemsPerPage !== null ? (string)$this->itemsPerPage: '';
 
-		return $this->renderResult($meta);
-	}
+        return $this->renderResult($meta);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
 	 * @return int
 	 */
 	public function getStatus() {
-		$status  = parent::getStatus();
+		$status = parent::getStatus();
 		if ($status === Http::STATUS_FORBIDDEN || $status === API::RESPOND_UNAUTHORISED) {
 			return Http::STATUS_UNAUTHORIZED;
 		}
@@ -70,8 +70,8 @@ 
 			'message' => $this->getOCSStatus() === 100 ? 'OK' : $this->statusMessage,
 		];
 
-		$meta['totalitems'] = $this->itemsCount !== null ? (string)$this->itemsCount : '';
-		$meta['itemsperpage'] = $this->itemsPerPage !== null ? (string)$this->itemsPerPage: '';
+		$meta['totalitems'] = $this->itemsCount !== null ? (string) $this->itemsCount : '';
+		$meta['itemsperpage'] = $this->itemsPerPage !== null ? (string) $this->itemsPerPage : '';
 
 		return $this->renderResult($meta);
 	}

lib/private/AppFramework/Routing/RouteConfig.php

Indentation +236 added lines, -236 removed lines

@@ -36,242 +36,242 @@
  * @package OC\AppFramework\routing
  */
 class RouteConfig {
-	/** @var DIContainer */
-	private $container;
-
-	/** @var IRouter */
-	private $router;
-
-	/** @var array */
-	private $routes;
-
-	/** @var string */
-	private $appName;
-
-	/** @var string[] */
-	private $controllerNameCache = [];
-
-	/**
-	 * @param \OC\AppFramework\DependencyInjection\DIContainer $container
-	 * @param \OCP\Route\IRouter $router
-	 * @param array $routes
-	 * @internal param $appName
-	 */
-	public function __construct(DIContainer $container, IRouter $router, $routes) {
-		$this->routes = $routes;
-		$this->container = $container;
-		$this->router = $router;
-		$this->appName = $container['AppName'];
-	}
-
-	/**
-	 * The routes and resource will be registered to the \OCP\Route\IRouter
-	 */
-	public function register() {
-
-		// parse simple
-		$this->processSimpleRoutes($this->routes);
-
-		// parse resources
-		$this->processResources($this->routes);
-
-		/*
+    /** @var DIContainer */
+    private $container;
+
+    /** @var IRouter */
+    private $router;
+
+    /** @var array */
+    private $routes;
+
+    /** @var string */
+    private $appName;
+
+    /** @var string[] */
+    private $controllerNameCache = [];
+
+    /**
+     * @param \OC\AppFramework\DependencyInjection\DIContainer $container
+     * @param \OCP\Route\IRouter $router
+     * @param array $routes
+     * @internal param $appName
+     */
+    public function __construct(DIContainer $container, IRouter $router, $routes) {
+        $this->routes = $routes;
+        $this->container = $container;
+        $this->router = $router;
+        $this->appName = $container['AppName'];
+    }
+
+    /**
+     * The routes and resource will be registered to the \OCP\Route\IRouter
+     */
+    public function register() {
+
+        // parse simple
+        $this->processSimpleRoutes($this->routes);
+
+        // parse resources
+        $this->processResources($this->routes);
+
+        /*
 		 * OCS routes go into a different collection
 		 */
-		$oldCollection = $this->router->getCurrentCollection();
-		$this->router->useCollection($oldCollection.'.ocs');
-
-		// parse ocs simple routes
-		$this->processOCS($this->routes);
-
-		$this->router->useCollection($oldCollection);
-	}
-
-	private function processOCS(array $routes) {
-		$ocsRoutes = isset($routes['ocs']) ? $routes['ocs'] : [];
-		foreach ($ocsRoutes as $ocsRoute) {
-			$name = $ocsRoute['name'];
-			$postfix = '';
-
-			if (isset($ocsRoute['postfix'])) {
-				$postfix = $ocsRoute['postfix'];
-			}
-
-			if (isset($ocsRoute['root'])) {
-				$root = $ocsRoute['root'];
-			} else {
-				$root = '/apps/'.$this->appName;
-			}
-
-			$url = $root . $ocsRoute['url'];
-			$verb = isset($ocsRoute['verb']) ? strtoupper($ocsRoute['verb']) : 'GET';
-
-			$split = explode('#', $name, 2);
-			if (count($split) != 2) {
-				throw new \UnexpectedValueException('Invalid route name');
-			}
-			$controller = $split[0];
-			$action = $split[1];
-
-			$controllerName = $this->buildControllerName($controller);
-			$actionName = $this->buildActionName($action);
-
-			// register the route
-			$handler = new RouteActionHandler($this->container, $controllerName, $actionName);
-
-			$router = $this->router->create('ocs.'.$this->appName.'.'.$controller.'.'.$action . $postfix, $url)
-				->method($verb)
-				->action($handler);
-
-			// optionally register requirements for route. This is used to
-			// tell the route parser how url parameters should be matched
-			if(array_key_exists('requirements', $ocsRoute)) {
-				$router->requirements($ocsRoute['requirements']);
-			}
-
-			// optionally register defaults for route. This is used to
-			// tell the route parser how url parameters should be default valued
-			if(array_key_exists('defaults', $ocsRoute)) {
-				$router->defaults($ocsRoute['defaults']);
-			}
-		}
-	}
-
-	/**
-	 * Creates one route base on the give configuration
-	 * @param array $routes
-	 * @throws \UnexpectedValueException
-	 */
-	private function processSimpleRoutes($routes)
-	{
-		$simpleRoutes = isset($routes['routes']) ? $routes['routes'] : array();
-		foreach ($simpleRoutes as $simpleRoute) {
-			$name = $simpleRoute['name'];
-			$postfix = '';
-
-			if (isset($simpleRoute['postfix'])) {
-				$postfix = $simpleRoute['postfix'];
-			}
-
-			$url = $simpleRoute['url'];
-			$verb = isset($simpleRoute['verb']) ? strtoupper($simpleRoute['verb']) : 'GET';
-
-			$split = explode('#', $name, 2);
-			if (count($split) != 2) {
-				throw new \UnexpectedValueException('Invalid route name');
-			}
-			$controller = $split[0];
-			$action = $split[1];
-
-			$controllerName = $this->buildControllerName($controller);
-			$actionName = $this->buildActionName($action);
-
-			// register the route
-			$handler = new RouteActionHandler($this->container, $controllerName, $actionName);
-			$router = $this->router->create($this->appName.'.'.$controller.'.'.$action . $postfix, $url)
-							->method($verb)
-							->action($handler);
-
-			// optionally register requirements for route. This is used to
-			// tell the route parser how url parameters should be matched
-			if(array_key_exists('requirements', $simpleRoute)) {
-				$router->requirements($simpleRoute['requirements']);
-			}
-
-			// optionally register defaults for route. This is used to
-			// tell the route parser how url parameters should be default valued
-			if(array_key_exists('defaults', $simpleRoute)) {
-				$router->defaults($simpleRoute['defaults']);
-			}
-		}
-	}
-
-	/**
-	 * For a given name and url restful routes are created:
-	 *  - index
-	 *  - show
-	 *  - new
-	 *  - create
-	 *  - update
-	 *  - destroy
-	 *
-	 * @param array $routes
-	 */
-	private function processResources($routes)
-	{
-		// declaration of all restful actions
-		$actions = array(
-			array('name' => 'index', 'verb' => 'GET', 'on-collection' => true),
-			array('name' => 'show', 'verb' => 'GET'),
-			array('name' => 'create', 'verb' => 'POST', 'on-collection' => true),
-			array('name' => 'update', 'verb' => 'PUT'),
-			array('name' => 'destroy', 'verb' => 'DELETE'),
-		);
-
-		$resources = isset($routes['resources']) ? $routes['resources'] : array();
-		foreach ($resources as $resource => $config) {
-
-			// the url parameter used as id to the resource
-			foreach($actions as $action) {
-				$url = $config['url'];
-				$method = $action['name'];
-				$verb = isset($action['verb']) ? strtoupper($action['verb']) : 'GET';
-				$collectionAction = isset($action['on-collection']) ? $action['on-collection'] : false;
-				if (!$collectionAction) {
-					$url = $url . '/{id}';
-				}
-				if (isset($action['url-postfix'])) {
-					$url = $url . '/' . $action['url-postfix'];
-				}
-
-				$controller = $resource;
-
-				$controllerName = $this->buildControllerName($controller);
-				$actionName = $this->buildActionName($method);
-
-				$routeName = $this->appName . '.' . strtolower($resource) . '.' . strtolower($method);
-
-				$this->router->create($routeName, $url)->method($verb)->action(
-					new RouteActionHandler($this->container, $controllerName, $actionName)
-				);
-			}
-		}
-	}
-
-	/**
-	 * Based on a given route name the controller name is generated
-	 * @param string $controller
-	 * @return string
-	 */
-	private function buildControllerName($controller)
-	{
-		if (!isset($this->controllerNameCache[$controller])) {
-			$this->controllerNameCache[$controller] = $this->underScoreToCamelCase(ucfirst($controller)) . 'Controller';
-		}
-		return $this->controllerNameCache[$controller];
-	}
-
-	/**
-	 * Based on the action part of the route name the controller method name is generated
-	 * @param string $action
-	 * @return string
-	 */
-	private function buildActionName($action) {
-		return $this->underScoreToCamelCase($action);
-	}
-
-	/**
-	 * Underscored strings are converted to camel case strings
-	 * @param string $str
-	 * @return string
-	 */
-	private function underScoreToCamelCase($str) {
-		$pattern = "/_[a-z]?/";
-		return preg_replace_callback(
-			$pattern,
-			function ($matches) {
-				return strtoupper(ltrim($matches[0], "_"));
-			},
-			$str);
-	}
+        $oldCollection = $this->router->getCurrentCollection();
+        $this->router->useCollection($oldCollection.'.ocs');
+
+        // parse ocs simple routes
+        $this->processOCS($this->routes);
+
+        $this->router->useCollection($oldCollection);
+    }
+
+    private function processOCS(array $routes) {
+        $ocsRoutes = isset($routes['ocs']) ? $routes['ocs'] : [];
+        foreach ($ocsRoutes as $ocsRoute) {
+            $name = $ocsRoute['name'];
+            $postfix = '';
+
+            if (isset($ocsRoute['postfix'])) {
+                $postfix = $ocsRoute['postfix'];
+            }
+
+            if (isset($ocsRoute['root'])) {
+                $root = $ocsRoute['root'];
+            } else {
+                $root = '/apps/'.$this->appName;
+            }
+
+            $url = $root . $ocsRoute['url'];
+            $verb = isset($ocsRoute['verb']) ? strtoupper($ocsRoute['verb']) : 'GET';
+
+            $split = explode('#', $name, 2);
+            if (count($split) != 2) {
+                throw new \UnexpectedValueException('Invalid route name');
+            }
+            $controller = $split[0];
+            $action = $split[1];
+
+            $controllerName = $this->buildControllerName($controller);
+            $actionName = $this->buildActionName($action);
+
+            // register the route
+            $handler = new RouteActionHandler($this->container, $controllerName, $actionName);
+
+            $router = $this->router->create('ocs.'.$this->appName.'.'.$controller.'.'.$action . $postfix, $url)
+                ->method($verb)
+                ->action($handler);
+
+            // optionally register requirements for route. This is used to
+            // tell the route parser how url parameters should be matched
+            if(array_key_exists('requirements', $ocsRoute)) {
+                $router->requirements($ocsRoute['requirements']);
+            }
+
+            // optionally register defaults for route. This is used to
+            // tell the route parser how url parameters should be default valued
+            if(array_key_exists('defaults', $ocsRoute)) {
+                $router->defaults($ocsRoute['defaults']);
+            }
+        }
+    }
+
+    /**
+     * Creates one route base on the give configuration
+     * @param array $routes
+     * @throws \UnexpectedValueException
+     */
+    private function processSimpleRoutes($routes)
+    {
+        $simpleRoutes = isset($routes['routes']) ? $routes['routes'] : array();
+        foreach ($simpleRoutes as $simpleRoute) {
+            $name = $simpleRoute['name'];
+            $postfix = '';
+
+            if (isset($simpleRoute['postfix'])) {
+                $postfix = $simpleRoute['postfix'];
+            }
+
+            $url = $simpleRoute['url'];
+            $verb = isset($simpleRoute['verb']) ? strtoupper($simpleRoute['verb']) : 'GET';
+
+            $split = explode('#', $name, 2);
+            if (count($split) != 2) {
+                throw new \UnexpectedValueException('Invalid route name');
+            }
+            $controller = $split[0];
+            $action = $split[1];
+
+            $controllerName = $this->buildControllerName($controller);
+            $actionName = $this->buildActionName($action);
+
+            // register the route
+            $handler = new RouteActionHandler($this->container, $controllerName, $actionName);
+            $router = $this->router->create($this->appName.'.'.$controller.'.'.$action . $postfix, $url)
+                            ->method($verb)
+                            ->action($handler);
+
+            // optionally register requirements for route. This is used to
+            // tell the route parser how url parameters should be matched
+            if(array_key_exists('requirements', $simpleRoute)) {
+                $router->requirements($simpleRoute['requirements']);
+            }
+
+            // optionally register defaults for route. This is used to
+            // tell the route parser how url parameters should be default valued
+            if(array_key_exists('defaults', $simpleRoute)) {
+                $router->defaults($simpleRoute['defaults']);
+            }
+        }
+    }
+
+    /**
+     * For a given name and url restful routes are created:
+     *  - index
+     *  - show
+     *  - new
+     *  - create
+     *  - update
+     *  - destroy
+     *
+     * @param array $routes
+     */
+    private function processResources($routes)
+    {
+        // declaration of all restful actions
+        $actions = array(
+            array('name' => 'index', 'verb' => 'GET', 'on-collection' => true),
+            array('name' => 'show', 'verb' => 'GET'),
+            array('name' => 'create', 'verb' => 'POST', 'on-collection' => true),
+            array('name' => 'update', 'verb' => 'PUT'),
+            array('name' => 'destroy', 'verb' => 'DELETE'),
+        );
+
+        $resources = isset($routes['resources']) ? $routes['resources'] : array();
+        foreach ($resources as $resource => $config) {
+
+            // the url parameter used as id to the resource
+            foreach($actions as $action) {
+                $url = $config['url'];
+                $method = $action['name'];
+                $verb = isset($action['verb']) ? strtoupper($action['verb']) : 'GET';
+                $collectionAction = isset($action['on-collection']) ? $action['on-collection'] : false;
+                if (!$collectionAction) {
+                    $url = $url . '/{id}';
+                }
+                if (isset($action['url-postfix'])) {
+                    $url = $url . '/' . $action['url-postfix'];
+                }
+
+                $controller = $resource;
+
+                $controllerName = $this->buildControllerName($controller);
+                $actionName = $this->buildActionName($method);
+
+                $routeName = $this->appName . '.' . strtolower($resource) . '.' . strtolower($method);
+
+                $this->router->create($routeName, $url)->method($verb)->action(
+                    new RouteActionHandler($this->container, $controllerName, $actionName)
+                );
+            }
+        }
+    }
+
+    /**
+     * Based on a given route name the controller name is generated
+     * @param string $controller
+     * @return string
+     */
+    private function buildControllerName($controller)
+    {
+        if (!isset($this->controllerNameCache[$controller])) {
+            $this->controllerNameCache[$controller] = $this->underScoreToCamelCase(ucfirst($controller)) . 'Controller';
+        }
+        return $this->controllerNameCache[$controller];
+    }
+
+    /**
+     * Based on the action part of the route name the controller method name is generated
+     * @param string $action
+     * @return string
+     */
+    private function buildActionName($action) {
+        return $this->underScoreToCamelCase($action);
+    }
+
+    /**
+     * Underscored strings are converted to camel case strings
+     * @param string $str
+     * @return string
+     */
+    private function underScoreToCamelCase($str) {
+        $pattern = "/_[a-z]?/";
+        return preg_replace_callback(
+            $pattern,
+            function ($matches) {
+                return strtoupper(ltrim($matches[0], "_"));
+            },
+            $str);
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -103,7 +103,7 @@ 
 				$root = '/apps/'.$this->appName;
 			}
 
-			$url = $root . $ocsRoute['url'];
+			$url = $root.$ocsRoute['url'];
 			$verb = isset($ocsRoute['verb']) ? strtoupper($ocsRoute['verb']) : 'GET';
 
 			$split = explode('#', $name, 2);
@@ -119,19 +119,19 @@ 
 			// register the route
 			$handler = new RouteActionHandler($this->container, $controllerName, $actionName);
 
-			$router = $this->router->create('ocs.'.$this->appName.'.'.$controller.'.'.$action . $postfix, $url)
+			$router = $this->router->create('ocs.'.$this->appName.'.'.$controller.'.'.$action.$postfix, $url)
 				->method($verb)
 				->action($handler);
 
 			// optionally register requirements for route. This is used to
 			// tell the route parser how url parameters should be matched
-			if(array_key_exists('requirements', $ocsRoute)) {
+			if (array_key_exists('requirements', $ocsRoute)) {
 				$router->requirements($ocsRoute['requirements']);
 			}
 
 			// optionally register defaults for route. This is used to
 			// tell the route parser how url parameters should be default valued
-			if(array_key_exists('defaults', $ocsRoute)) {
+			if (array_key_exists('defaults', $ocsRoute)) {
 				$router->defaults($ocsRoute['defaults']);
 			}
 		}
@@ -168,19 +168,19 @@ 
 
 			// register the route
 			$handler = new RouteActionHandler($this->container, $controllerName, $actionName);
-			$router = $this->router->create($this->appName.'.'.$controller.'.'.$action . $postfix, $url)
+			$router = $this->router->create($this->appName.'.'.$controller.'.'.$action.$postfix, $url)
 							->method($verb)
 							->action($handler);
 
 			// optionally register requirements for route. This is used to
 			// tell the route parser how url parameters should be matched
-			if(array_key_exists('requirements', $simpleRoute)) {
+			if (array_key_exists('requirements', $simpleRoute)) {
 				$router->requirements($simpleRoute['requirements']);
 			}
 
 			// optionally register defaults for route. This is used to
 			// tell the route parser how url parameters should be default valued
-			if(array_key_exists('defaults', $simpleRoute)) {
+			if (array_key_exists('defaults', $simpleRoute)) {
 				$router->defaults($simpleRoute['defaults']);
 			}
 		}
@@ -212,16 +212,16 @@ 
 		foreach ($resources as $resource => $config) {
 
 			// the url parameter used as id to the resource
-			foreach($actions as $action) {
+			foreach ($actions as $action) {
 				$url = $config['url'];
 				$method = $action['name'];
 				$verb = isset($action['verb']) ? strtoupper($action['verb']) : 'GET';
 				$collectionAction = isset($action['on-collection']) ? $action['on-collection'] : false;
 				if (!$collectionAction) {
-					$url = $url . '/{id}';
+					$url = $url.'/{id}';
 				}
 				if (isset($action['url-postfix'])) {
-					$url = $url . '/' . $action['url-postfix'];
+					$url = $url.'/'.$action['url-postfix'];
 				}
 
 				$controller = $resource;
@@ -229,7 +229,7 @@ 
 				$controllerName = $this->buildControllerName($controller);
 				$actionName = $this->buildActionName($method);
 
-				$routeName = $this->appName . '.' . strtolower($resource) . '.' . strtolower($method);
+				$routeName = $this->appName.'.'.strtolower($resource).'.'.strtolower($method);
 
 				$this->router->create($routeName, $url)->method($verb)->action(
 					new RouteActionHandler($this->container, $controllerName, $actionName)
@@ -246,7 +246,7 @@ 
 	private function buildControllerName($controller)
 	{
 		if (!isset($this->controllerNameCache[$controller])) {
-			$this->controllerNameCache[$controller] = $this->underScoreToCamelCase(ucfirst($controller)) . 'Controller';
+			$this->controllerNameCache[$controller] = $this->underScoreToCamelCase(ucfirst($controller)).'Controller';
 		}
 		return $this->controllerNameCache[$controller];
 	}
@@ -269,7 +269,7 @@ 
 		$pattern = "/_[a-z]?/";
 		return preg_replace_callback(
 			$pattern,
-			function ($matches) {
+			function($matches) {
 				return strtoupper(ltrim($matches[0], "_"));
 			},
 			$str);

lib/private/AppFramework/Routing/RouteActionHandler.php

Indentation +15 added lines, -15 removed lines

@@ -29,21 +29,21 @@
 use \OC\AppFramework\DependencyInjection\DIContainer;
 
 class RouteActionHandler {
-	private $controllerName;
-	private $actionName;
-	private $container;
+    private $controllerName;
+    private $actionName;
+    private $container;
 
-	/**
-	 * @param string $controllerName
-	 * @param string $actionName
-	 */
-	public function __construct(DIContainer $container, $controllerName, $actionName) {
-		$this->controllerName = $controllerName;
-		$this->actionName = $actionName;
-		$this->container = $container;
-	}
+    /**
+     * @param string $controllerName
+     * @param string $actionName
+     */
+    public function __construct(DIContainer $container, $controllerName, $actionName) {
+        $this->controllerName = $controllerName;
+        $this->actionName = $actionName;
+        $this->container = $container;
+    }
 
-	public function __invoke($params) {
-		App::main($this->controllerName, $this->actionName, $this->container, $params);
-	}
+    public function __invoke($params) {
+        App::main($this->controllerName, $this->actionName, $this->container, $params);
+    }
 }

lib/private/Share/SearchResultSorter.php

Indentation +43 added lines, -43 removed lines

@@ -26,51 +26,51 @@
 use OCP\ILogger;
 
 class SearchResultSorter {
-	private $search;
-	private $encoding;
-	private $key;
-	private $log;
+    private $search;
+    private $encoding;
+    private $key;
+    private $log;
 
-	/**
-	 * @param string $search the search term as was given by the user
-	 * @param string $key the array key containing the value that should be compared
-	 * against
-	 * @param string $encoding optional, encoding to use, defaults to UTF-8
-	 * @param ILogger $log optional
-	 */
-	public function __construct($search, $key, ILogger $log = null, $encoding = 'UTF-8') {
-		$this->encoding = $encoding;
-		$this->key = $key;
-		$this->log = $log;
-		$this->search = mb_strtolower($search, $this->encoding);
-	}
+    /**
+     * @param string $search the search term as was given by the user
+     * @param string $key the array key containing the value that should be compared
+     * against
+     * @param string $encoding optional, encoding to use, defaults to UTF-8
+     * @param ILogger $log optional
+     */
+    public function __construct($search, $key, ILogger $log = null, $encoding = 'UTF-8') {
+        $this->encoding = $encoding;
+        $this->key = $key;
+        $this->log = $log;
+        $this->search = mb_strtolower($search, $this->encoding);
+    }
 
-	/**
-	 * User and Group names matching the search term at the beginning shall appear
-	 * on top of the share dialog. Following entries in alphabetical order.
-	 * Callback function for usort. http://php.net/usort
-	 */
-	public function sort($a, $b) {
-		if(!isset($a[$this->key]) || !isset($b[$this->key])) {
-			if(!is_null($this->log)) {
-				$this->log->error('Sharing dialogue: cannot sort due to ' .
-								  'missing array key', array('app' => 'core'));
-			}
-			return 0;
-		}
-		$nameA = mb_strtolower($a[$this->key], $this->encoding);
-		$nameB = mb_strtolower($b[$this->key], $this->encoding);
-		$i = mb_strpos($nameA, $this->search, 0, $this->encoding);
-		$j = mb_strpos($nameB, $this->search, 0, $this->encoding);
+    /**
+     * User and Group names matching the search term at the beginning shall appear
+     * on top of the share dialog. Following entries in alphabetical order.
+     * Callback function for usort. http://php.net/usort
+     */
+    public function sort($a, $b) {
+        if(!isset($a[$this->key]) || !isset($b[$this->key])) {
+            if(!is_null($this->log)) {
+                $this->log->error('Sharing dialogue: cannot sort due to ' .
+                                    'missing array key', array('app' => 'core'));
+            }
+            return 0;
+        }
+        $nameA = mb_strtolower($a[$this->key], $this->encoding);
+        $nameB = mb_strtolower($b[$this->key], $this->encoding);
+        $i = mb_strpos($nameA, $this->search, 0, $this->encoding);
+        $j = mb_strpos($nameB, $this->search, 0, $this->encoding);
 
-		if($i === $j || $i > 0 && $j > 0) {
-			return strcmp(mb_strtolower($nameA, $this->encoding),
-						  mb_strtolower($nameB, $this->encoding));
-		} elseif ($i === 0) {
-			return -1;
-		} else {
-			return 1;
-		}
-	}
+        if($i === $j || $i > 0 && $j > 0) {
+            return strcmp(mb_strtolower($nameA, $this->encoding),
+                            mb_strtolower($nameB, $this->encoding));
+        } elseif ($i === 0) {
+            return -1;
+        } else {
+            return 1;
+        }
+    }
 }
 

Spacing +4 added lines, -4 removed lines

@@ -51,9 +51,9 @@ 
 	 * Callback function for usort. http://php.net/usort
 	 */
 	public function sort($a, $b) {
-		if(!isset($a[$this->key]) || !isset($b[$this->key])) {
-			if(!is_null($this->log)) {
-				$this->log->error('Sharing dialogue: cannot sort due to ' .
+		if (!isset($a[$this->key]) || !isset($b[$this->key])) {
+			if (!is_null($this->log)) {
+				$this->log->error('Sharing dialogue: cannot sort due to '.
 								  'missing array key', array('app' => 'core'));
 			}
 			return 0;
@@ -63,7 +63,7 @@ 
 		$i = mb_strpos($nameA, $this->search, 0, $this->encoding);
 		$j = mb_strpos($nameB, $this->search, 0, $this->encoding);
 
-		if($i === $j || $i > 0 && $j > 0) {
+		if ($i === $j || $i > 0 && $j > 0) {
 			return strcmp(mb_strtolower($nameA, $this->encoding),
 						  mb_strtolower($nameB, $this->encoding));
 		} elseif ($i === 0) {

lib/private/Share/Constants.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 
 	const FORMAT_NONE = -1;
 	const FORMAT_STATUSES = -2;
-	const FORMAT_SOURCES = -3;  // ToDo Check if it is still in use otherwise remove it
+	const FORMAT_SOURCES = -3; // ToDo Check if it is still in use otherwise remove it
 
 	const RESPONSE_FORMAT = 'json'; // default resonse format for ocs calls
 

Indentation +22 added lines, -22 removed lines

@@ -29,30 +29,30 @@
 
 class Constants {
 
-	const SHARE_TYPE_USER = 0;
-	const SHARE_TYPE_GROUP = 1;
-	// const SHARE_TYPE_USERGROUP = 2; // Internal type used by DefaultShareProvider
-	const SHARE_TYPE_LINK = 3;
-	const SHARE_TYPE_EMAIL = 4;
-	const SHARE_TYPE_CONTACT = 5; // ToDo Check if it is still in use otherwise remove it
-	const SHARE_TYPE_REMOTE = 6;
-	const SHARE_TYPE_CIRCLE = 7;
-	const SHARE_TYPE_GUEST = 8;
-	const SHARE_TYPE_REMOTE_GROUP = 9;
-	const SHARE_TYPE_ROOM = 10;
-	// const SHARE_TYPE_USERROOM = 11; // Internal type used by RoomShareProvider
+    const SHARE_TYPE_USER = 0;
+    const SHARE_TYPE_GROUP = 1;
+    // const SHARE_TYPE_USERGROUP = 2; // Internal type used by DefaultShareProvider
+    const SHARE_TYPE_LINK = 3;
+    const SHARE_TYPE_EMAIL = 4;
+    const SHARE_TYPE_CONTACT = 5; // ToDo Check if it is still in use otherwise remove it
+    const SHARE_TYPE_REMOTE = 6;
+    const SHARE_TYPE_CIRCLE = 7;
+    const SHARE_TYPE_GUEST = 8;
+    const SHARE_TYPE_REMOTE_GROUP = 9;
+    const SHARE_TYPE_ROOM = 10;
+    // const SHARE_TYPE_USERROOM = 11; // Internal type used by RoomShareProvider
 
-	const FORMAT_NONE = -1;
-	const FORMAT_STATUSES = -2;
-	const FORMAT_SOURCES = -3;  // ToDo Check if it is still in use otherwise remove it
+    const FORMAT_NONE = -1;
+    const FORMAT_STATUSES = -2;
+    const FORMAT_SOURCES = -3;  // ToDo Check if it is still in use otherwise remove it
 
-	const RESPONSE_FORMAT = 'json'; // default resonse format for ocs calls
+    const RESPONSE_FORMAT = 'json'; // default resonse format for ocs calls
 
-	const TOKEN_LENGTH = 15; // old (oc7) length is 32, keep token length in db at least that for compatibility
+    const TOKEN_LENGTH = 15; // old (oc7) length is 32, keep token length in db at least that for compatibility
 
-	protected static $shareTypeUserAndGroups = -1;
-	protected static $shareTypeGroupUserUnique = 2;
-	protected static $backends = array();
-	protected static $backendTypes = array();
-	protected static $isResharingAllowed;
+    protected static $shareTypeUserAndGroups = -1;
+    protected static $shareTypeGroupUserUnique = 2;
+    protected static $backends = array();
+    protected static $backendTypes = array();
+    protected static $isResharingAllowed;
 }

lib/private/Repair/RemoveRootShares.php

Indentation +102 added lines, -102 removed lines

@@ -35,107 +35,107 @@
  */
 class RemoveRootShares implements IRepairStep {
 
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IRootFolder */
-	protected $rootFolder;
-
-	/**
-	 * RemoveRootShares constructor.
-	 *
-	 * @param IDBConnection $connection
-	 * @param IUserManager $userManager
-	 * @param IRootFolder $rootFolder
-	 */
-	public function __construct(IDBConnection $connection,
-								IUserManager $userManager,
-								IRootFolder $rootFolder) {
-		$this->connection = $connection;
-		$this->userManager = $userManager;
-		$this->rootFolder = $rootFolder;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Remove shares of a users root folder';
-	}
-
-	/**
-	 * @param IOutput $output
-	 */
-	public function run(IOutput $output) {
-		if ($this->rootSharesExist()) {
-			$this->removeRootShares($output);
-		}
-	}
-
-	/**
-	 * @param IOutput $output
-	 */
-	private function removeRootShares(IOutput $output) {
-		$function = function(IUser $user) use ($output) {
-			$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-			$fileId = $userFolder->getId();
-
-			$qb = $this->connection->getQueryBuilder();
-			$qb->delete('share')
-				->where($qb->expr()->eq('file_source', $qb->createNamedParameter($fileId)))
-				->andWhere($qb->expr()->orX(
-					$qb->expr()->eq('item_type', $qb->expr()->literal('file')),
-					$qb->expr()->eq('item_type', $qb->expr()->literal('folder'))
-				));
-
-			$qb->execute();
-
-			$output->advance();
-		};
-
-		$output->startProgress($this->userManager->countSeenUsers());
-
-		$this->userManager->callForSeenUsers($function);
-
-		$output->finishProgress();
-	}
-
-	/**
-	 * Verify if this repair steps is required
-	 * It *should* not be necessary in most cases and it can be very
-	 * costly.
-	 *
-	 * @return bool
-	 */
-	private function rootSharesExist() {
-		$qb = $this->connection->getQueryBuilder();
-		$qb2 = $this->connection->getQueryBuilder();
-
-		$qb->select('fileid')
-			->from('filecache')
-			->where($qb->expr()->eq('path', $qb->expr()->literal('files')));
-
-		$qb2->select('id')
-			->from('share')
-			->where($qb2->expr()->in('file_source', $qb2->createFunction($qb->getSQL())))
-			->andWhere($qb2->expr()->orX(
-				$qb2->expr()->eq('item_type', $qb->expr()->literal('file')),
-				$qb2->expr()->eq('item_type', $qb->expr()->literal('folder'))
-			))
-			->setMaxResults(1);
-
-		$cursor = $qb2->execute();
-		$data = $cursor->fetch();
-		$cursor->closeCursor();
-
-		if ($data === false) {
-			return false;
-		}
-
-		return true;
-	}
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IRootFolder */
+    protected $rootFolder;
+
+    /**
+     * RemoveRootShares constructor.
+     *
+     * @param IDBConnection $connection
+     * @param IUserManager $userManager
+     * @param IRootFolder $rootFolder
+     */
+    public function __construct(IDBConnection $connection,
+                                IUserManager $userManager,
+                                IRootFolder $rootFolder) {
+        $this->connection = $connection;
+        $this->userManager = $userManager;
+        $this->rootFolder = $rootFolder;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Remove shares of a users root folder';
+    }
+
+    /**
+     * @param IOutput $output
+     */
+    public function run(IOutput $output) {
+        if ($this->rootSharesExist()) {
+            $this->removeRootShares($output);
+        }
+    }
+
+    /**
+     * @param IOutput $output
+     */
+    private function removeRootShares(IOutput $output) {
+        $function = function(IUser $user) use ($output) {
+            $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+            $fileId = $userFolder->getId();
+
+            $qb = $this->connection->getQueryBuilder();
+            $qb->delete('share')
+                ->where($qb->expr()->eq('file_source', $qb->createNamedParameter($fileId)))
+                ->andWhere($qb->expr()->orX(
+                    $qb->expr()->eq('item_type', $qb->expr()->literal('file')),
+                    $qb->expr()->eq('item_type', $qb->expr()->literal('folder'))
+                ));
+
+            $qb->execute();
+
+            $output->advance();
+        };
+
+        $output->startProgress($this->userManager->countSeenUsers());
+
+        $this->userManager->callForSeenUsers($function);
+
+        $output->finishProgress();
+    }
+
+    /**
+     * Verify if this repair steps is required
+     * It *should* not be necessary in most cases and it can be very
+     * costly.
+     *
+     * @return bool
+     */
+    private function rootSharesExist() {
+        $qb = $this->connection->getQueryBuilder();
+        $qb2 = $this->connection->getQueryBuilder();
+
+        $qb->select('fileid')
+            ->from('filecache')
+            ->where($qb->expr()->eq('path', $qb->expr()->literal('files')));
+
+        $qb2->select('id')
+            ->from('share')
+            ->where($qb2->expr()->in('file_source', $qb2->createFunction($qb->getSQL())))
+            ->andWhere($qb2->expr()->orX(
+                $qb2->expr()->eq('item_type', $qb->expr()->literal('file')),
+                $qb2->expr()->eq('item_type', $qb->expr()->literal('folder'))
+            ))
+            ->setMaxResults(1);
+
+        $cursor = $qb2->execute();
+        $data = $cursor->fetch();
+        $cursor->closeCursor();
+
+        if ($data === false) {
+            return false;
+        }
+
+        return true;
+    }
 }
 

lib/private/Repair/MoveUpdaterStepFile.php

Indentation +39 added lines, -39 removed lines

@@ -28,53 +28,53 @@
 
 class MoveUpdaterStepFile implements IRepairStep {
 
-	/** @var \OCP\IConfig */
-	protected $config;
+    /** @var \OCP\IConfig */
+    protected $config;
 
-	/**
-	 * @param \OCP\IConfig $config
-	 */
-	public function __construct($config) {
-		$this->config = $config;
-	}
+    /**
+     * @param \OCP\IConfig $config
+     */
+    public function __construct($config) {
+        $this->config = $config;
+    }
 
-	public function getName() {
-		return 'Move .step file of updater to backup location';
-	}
+    public function getName() {
+        return 'Move .step file of updater to backup location';
+    }
 
-	public function run(IOutput $output) {
+    public function run(IOutput $output) {
 
-		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
-		$instanceId = $this->config->getSystemValue('instanceid', null);
+        $dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
+        $instanceId = $this->config->getSystemValue('instanceid', null);
 
-		if(!is_string($instanceId) || empty($instanceId)) {
-			return;
-		}
+        if(!is_string($instanceId) || empty($instanceId)) {
+            return;
+        }
 
-		$updaterFolderPath = $dataDir . '/updater-' . $instanceId;
-		$stepFile = $updaterFolderPath . '/.step';
-		if(file_exists($stepFile)) {
-			$output->info('.step file exists');
+        $updaterFolderPath = $dataDir . '/updater-' . $instanceId;
+        $stepFile = $updaterFolderPath . '/.step';
+        if(file_exists($stepFile)) {
+            $output->info('.step file exists');
 
-			$previousStepFile = $updaterFolderPath . '/.step-previous-update';
+            $previousStepFile = $updaterFolderPath . '/.step-previous-update';
 
-			// cleanup
-			if(file_exists($previousStepFile)) {
-				if(\OC_Helper::rmdirr($previousStepFile)) {
-					$output->info('.step-previous-update removed');
-				} else {
-					$output->info('.step-previous-update can\'t be removed - abort move of .step file');
-					return;
-				}
-			}
+            // cleanup
+            if(file_exists($previousStepFile)) {
+                if(\OC_Helper::rmdirr($previousStepFile)) {
+                    $output->info('.step-previous-update removed');
+                } else {
+                    $output->info('.step-previous-update can\'t be removed - abort move of .step file');
+                    return;
+                }
+            }
 
-			// move step file
-			if(rename($stepFile, $previousStepFile)) {
-				$output->info('.step file moved to .step-previous-update');
-			} else {
-				$output->warning('.step file can\'t be moved');
-			}
-		}
-	}
+            // move step file
+            if(rename($stepFile, $previousStepFile)) {
+                $output->info('.step file moved to .step-previous-update');
+            } else {
+                $output->warning('.step file can\'t be moved');
+            }
+        }
+    }
 }
 

Spacing +9 added lines, -9 removed lines

@@ -44,23 +44,23 @@ 
 
 	public function run(IOutput $output) {
 
-		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
+		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
 		$instanceId = $this->config->getSystemValue('instanceid', null);
 
-		if(!is_string($instanceId) || empty($instanceId)) {
+		if (!is_string($instanceId) || empty($instanceId)) {
 			return;
 		}
 
-		$updaterFolderPath = $dataDir . '/updater-' . $instanceId;
-		$stepFile = $updaterFolderPath . '/.step';
-		if(file_exists($stepFile)) {
+		$updaterFolderPath = $dataDir.'/updater-'.$instanceId;
+		$stepFile = $updaterFolderPath.'/.step';
+		if (file_exists($stepFile)) {
 			$output->info('.step file exists');
 
-			$previousStepFile = $updaterFolderPath . '/.step-previous-update';
+			$previousStepFile = $updaterFolderPath.'/.step-previous-update';
 
 			// cleanup
-			if(file_exists($previousStepFile)) {
-				if(\OC_Helper::rmdirr($previousStepFile)) {
+			if (file_exists($previousStepFile)) {
+				if (\OC_Helper::rmdirr($previousStepFile)) {
 					$output->info('.step-previous-update removed');
 				} else {
 					$output->info('.step-previous-update can\'t be removed - abort move of .step file');
@@ -69,7 +69,7 @@ 
 			}
 
 			// move step file
-			if(rename($stepFile, $previousStepFile)) {
+			if (rename($stepFile, $previousStepFile)) {
 				$output->info('.step file moved to .step-previous-update');
 			} else {
 				$output->warning('.step file can\'t be moved');

lib/private/Repair/NC11/FixMountStorages.php

Indentation +39 added lines, -39 removed lines

@@ -29,50 +29,50 @@
 
 class FixMountStorages implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $db;
+    /** @var IDBConnection */
+    private $db;
 
-	/**
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		$this->db = $db;
-	}
+    /**
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        $this->db = $db;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Fix potential broken mount points';
-	}
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Fix potential broken mount points';
+    }
 
-	public function run(IOutput $output) {
-		$query = $this->db->getQueryBuilder();
-		$query->select('m.id', 'f.storage')
-			->from('mounts', 'm')
-			->leftJoin('m', 'filecache', 'f', $query->expr()->eq('m.root_id', 'f.fileid'))
-			->where($query->expr()->neq('m.storage_id', 'f.storage'));
+    public function run(IOutput $output) {
+        $query = $this->db->getQueryBuilder();
+        $query->select('m.id', 'f.storage')
+            ->from('mounts', 'm')
+            ->leftJoin('m', 'filecache', 'f', $query->expr()->eq('m.root_id', 'f.fileid'))
+            ->where($query->expr()->neq('m.storage_id', 'f.storage'));
 
-		$update = $this->db->getQueryBuilder();
-		$update->update('mounts')
-			->set('storage_id', $update->createParameter('storage'))
-			->where($query->expr()->eq('id', $update->createParameter('mount')));
+        $update = $this->db->getQueryBuilder();
+        $update->update('mounts')
+            ->set('storage_id', $update->createParameter('storage'))
+            ->where($query->expr()->eq('id', $update->createParameter('mount')));
 
-		$result = $query->execute();
-		$entriesUpdated = 0;
-		while ($row = $result->fetch()) {
-			$update->setParameter('storage', $row['storage'], IQueryBuilder::PARAM_INT)
-				->setParameter('mount', $row['id'], IQueryBuilder::PARAM_INT);
-			$update->execute();
-			$entriesUpdated++;
-		}
-		$result->closeCursor();
+        $result = $query->execute();
+        $entriesUpdated = 0;
+        while ($row = $result->fetch()) {
+            $update->setParameter('storage', $row['storage'], IQueryBuilder::PARAM_INT)
+                ->setParameter('mount', $row['id'], IQueryBuilder::PARAM_INT);
+            $update->execute();
+            $entriesUpdated++;
+        }
+        $result->closeCursor();
 
-		if ($entriesUpdated > 0) {
-			$output->info($entriesUpdated . ' mounts updated');
-			return;
-		}
+        if ($entriesUpdated > 0) {
+            $output->info($entriesUpdated . ' mounts updated');
+            return;
+        }
 
-		$output->info('No mounts updated');
-	}
+        $output->info('No mounts updated');
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 		$result->closeCursor();
 
 		if ($entriesUpdated > 0) {
-			$output->info($entriesUpdated . ' mounts updated');
+			$output->info($entriesUpdated.' mounts updated');
 			return;
 		}
 

lib/private/Repair/SqliteAutoincrement.php

Indentation +52 added lines, -52 removed lines

@@ -36,66 +36,66 @@
  * altered in order to retrigger SQL schema generation through OCSqlitePlatform.
  */
 class SqliteAutoincrement implements IRepairStep {
-	/**
-	 * @var \OC\DB\Connection
-	 */
-	protected $connection;
+    /**
+     * @var \OC\DB\Connection
+     */
+    protected $connection;
 
-	/**
-	 * @param \OC\DB\Connection $connection
-	 */
-	public function __construct($connection) {
-		$this->connection = $connection;
-	}
+    /**
+     * @param \OC\DB\Connection $connection
+     */
+    public function __construct($connection) {
+        $this->connection = $connection;
+    }
 
-	public function getName() {
-		return 'Repair SQLite autoincrement';
-	}
+    public function getName() {
+        return 'Repair SQLite autoincrement';
+    }
 
-	/**
-	 * Fix mime types
-	 */
-	public function run(IOutput $out) {
-		if (!$this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
-			return;
-		}
+    /**
+     * Fix mime types
+     */
+    public function run(IOutput $out) {
+        if (!$this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
+            return;
+        }
 
-		$sourceSchema = $this->connection->getSchemaManager()->createSchema();
+        $sourceSchema = $this->connection->getSchemaManager()->createSchema();
 
-		$schemaDiff = new SchemaDiff();
+        $schemaDiff = new SchemaDiff();
 
-		foreach ($sourceSchema->getTables() as $tableSchema) {
-			$primaryKey = $tableSchema->getPrimaryKey();
-			if (!$primaryKey) {
-				continue;
-			}
+        foreach ($sourceSchema->getTables() as $tableSchema) {
+            $primaryKey = $tableSchema->getPrimaryKey();
+            if (!$primaryKey) {
+                continue;
+            }
 
-			$columnNames = $primaryKey->getColumns();
+            $columnNames = $primaryKey->getColumns();
 
-			// add a column diff for every primary key column,
-			// but do not actually change anything, this will
-			// force the generation of SQL statements to alter
-			// those tables, which will then trigger the
-			// specific SQL code from OCSqlitePlatform
-			try {
-				$tableDiff = new TableDiff($tableSchema->getName());
-				$tableDiff->fromTable = $tableSchema;
-				foreach ($columnNames as $columnName) {
-					$columnSchema = $tableSchema->getColumn($columnName);
-					$columnDiff = new ColumnDiff($columnSchema->getName(), $columnSchema);
-					$tableDiff->changedColumns[] = $columnDiff;
-					$schemaDiff->changedTables[] = $tableDiff;
-				}
-			} catch (SchemaException $e) {
-				// ignore
-			}
-		}
+            // add a column diff for every primary key column,
+            // but do not actually change anything, this will
+            // force the generation of SQL statements to alter
+            // those tables, which will then trigger the
+            // specific SQL code from OCSqlitePlatform
+            try {
+                $tableDiff = new TableDiff($tableSchema->getName());
+                $tableDiff->fromTable = $tableSchema;
+                foreach ($columnNames as $columnName) {
+                    $columnSchema = $tableSchema->getColumn($columnName);
+                    $columnDiff = new ColumnDiff($columnSchema->getName(), $columnSchema);
+                    $tableDiff->changedColumns[] = $columnDiff;
+                    $schemaDiff->changedTables[] = $tableDiff;
+                }
+            } catch (SchemaException $e) {
+                // ignore
+            }
+        }
 
-		$this->connection->beginTransaction();
-		foreach ($schemaDiff->toSql($this->connection->getDatabasePlatform()) as $sql) {
-			$this->connection->query($sql);
-		}
-		$this->connection->commit();
-	}
+        $this->connection->beginTransaction();
+        foreach ($schemaDiff->toSql($this->connection->getDatabasePlatform()) as $sql) {
+            $this->connection->query($sql);
+        }
+        $this->connection->commit();
+    }
 }