@@ -32,127 +32,127 @@ |
||
32 | 32 | |
33 | 33 | class Result { |
34 | 34 | |
35 | - /** @var array */ |
|
36 | - protected $data; |
|
37 | - |
|
38 | - /** @var null|string */ |
|
39 | - protected $message; |
|
40 | - |
|
41 | - /** @var int */ |
|
42 | - protected $statusCode; |
|
43 | - |
|
44 | - /** @var integer */ |
|
45 | - protected $items; |
|
46 | - |
|
47 | - /** @var integer */ |
|
48 | - protected $perPage; |
|
49 | - |
|
50 | - /** @var array */ |
|
51 | - private $headers = []; |
|
52 | - |
|
53 | - /** |
|
54 | - * create the OCS_Result object |
|
55 | - * @param mixed $data the data to return |
|
56 | - * @param int $code |
|
57 | - * @param null|string $message |
|
58 | - * @param array $headers |
|
59 | - */ |
|
60 | - public function __construct($data = null, $code = 100, $message = null, $headers = []) { |
|
61 | - if ($data === null) { |
|
62 | - $this->data = []; |
|
63 | - } elseif (!is_array($data)) { |
|
64 | - $this->data = [$this->data]; |
|
65 | - } else { |
|
66 | - $this->data = $data; |
|
67 | - } |
|
68 | - $this->statusCode = $code; |
|
69 | - $this->message = $message; |
|
70 | - $this->headers = $headers; |
|
71 | - } |
|
72 | - |
|
73 | - /** |
|
74 | - * optionally set the total number of items available |
|
75 | - * @param int $items |
|
76 | - */ |
|
77 | - public function setTotalItems($items) { |
|
78 | - $this->items = $items; |
|
79 | - } |
|
80 | - |
|
81 | - /** |
|
82 | - * optionally set the the number of items per page |
|
83 | - * @param int $items |
|
84 | - */ |
|
85 | - public function setItemsPerPage($items) { |
|
86 | - $this->perPage = $items; |
|
87 | - } |
|
88 | - |
|
89 | - /** |
|
90 | - * get the status code |
|
91 | - * @return int |
|
92 | - */ |
|
93 | - public function getStatusCode() { |
|
94 | - return $this->statusCode; |
|
95 | - } |
|
96 | - |
|
97 | - /** |
|
98 | - * get the meta data for the result |
|
99 | - * @return array |
|
100 | - */ |
|
101 | - public function getMeta() { |
|
102 | - $meta = []; |
|
103 | - $meta['status'] = $this->succeeded() ? 'ok' : 'failure'; |
|
104 | - $meta['statuscode'] = $this->statusCode; |
|
105 | - $meta['message'] = $this->message; |
|
106 | - if (isset($this->items)) { |
|
107 | - $meta['totalitems'] = $this->items; |
|
108 | - } |
|
109 | - if (isset($this->perPage)) { |
|
110 | - $meta['itemsperpage'] = $this->perPage; |
|
111 | - } |
|
112 | - return $meta; |
|
113 | - } |
|
114 | - |
|
115 | - /** |
|
116 | - * get the result data |
|
117 | - * @return array |
|
118 | - */ |
|
119 | - public function getData() { |
|
120 | - return $this->data; |
|
121 | - } |
|
122 | - |
|
123 | - /** |
|
124 | - * return bool Whether the method succeeded |
|
125 | - * @return bool |
|
126 | - */ |
|
127 | - public function succeeded() { |
|
128 | - return ($this->statusCode == 100); |
|
129 | - } |
|
130 | - |
|
131 | - /** |
|
132 | - * Adds a new header to the response |
|
133 | - * @param string $name The name of the HTTP header |
|
134 | - * @param string $value The value, null will delete it |
|
135 | - * @return $this |
|
136 | - */ |
|
137 | - public function addHeader($name, $value) { |
|
138 | - $name = trim($name); // always remove leading and trailing whitespace |
|
139 | - // to be able to reliably check for security |
|
140 | - // headers |
|
141 | - |
|
142 | - if (is_null($value)) { |
|
143 | - unset($this->headers[$name]); |
|
144 | - } else { |
|
145 | - $this->headers[$name] = $value; |
|
146 | - } |
|
147 | - |
|
148 | - return $this; |
|
149 | - } |
|
150 | - |
|
151 | - /** |
|
152 | - * Returns the set headers |
|
153 | - * @return array the headers |
|
154 | - */ |
|
155 | - public function getHeaders() { |
|
156 | - return $this->headers; |
|
157 | - } |
|
35 | + /** @var array */ |
|
36 | + protected $data; |
|
37 | + |
|
38 | + /** @var null|string */ |
|
39 | + protected $message; |
|
40 | + |
|
41 | + /** @var int */ |
|
42 | + protected $statusCode; |
|
43 | + |
|
44 | + /** @var integer */ |
|
45 | + protected $items; |
|
46 | + |
|
47 | + /** @var integer */ |
|
48 | + protected $perPage; |
|
49 | + |
|
50 | + /** @var array */ |
|
51 | + private $headers = []; |
|
52 | + |
|
53 | + /** |
|
54 | + * create the OCS_Result object |
|
55 | + * @param mixed $data the data to return |
|
56 | + * @param int $code |
|
57 | + * @param null|string $message |
|
58 | + * @param array $headers |
|
59 | + */ |
|
60 | + public function __construct($data = null, $code = 100, $message = null, $headers = []) { |
|
61 | + if ($data === null) { |
|
62 | + $this->data = []; |
|
63 | + } elseif (!is_array($data)) { |
|
64 | + $this->data = [$this->data]; |
|
65 | + } else { |
|
66 | + $this->data = $data; |
|
67 | + } |
|
68 | + $this->statusCode = $code; |
|
69 | + $this->message = $message; |
|
70 | + $this->headers = $headers; |
|
71 | + } |
|
72 | + |
|
73 | + /** |
|
74 | + * optionally set the total number of items available |
|
75 | + * @param int $items |
|
76 | + */ |
|
77 | + public function setTotalItems($items) { |
|
78 | + $this->items = $items; |
|
79 | + } |
|
80 | + |
|
81 | + /** |
|
82 | + * optionally set the the number of items per page |
|
83 | + * @param int $items |
|
84 | + */ |
|
85 | + public function setItemsPerPage($items) { |
|
86 | + $this->perPage = $items; |
|
87 | + } |
|
88 | + |
|
89 | + /** |
|
90 | + * get the status code |
|
91 | + * @return int |
|
92 | + */ |
|
93 | + public function getStatusCode() { |
|
94 | + return $this->statusCode; |
|
95 | + } |
|
96 | + |
|
97 | + /** |
|
98 | + * get the meta data for the result |
|
99 | + * @return array |
|
100 | + */ |
|
101 | + public function getMeta() { |
|
102 | + $meta = []; |
|
103 | + $meta['status'] = $this->succeeded() ? 'ok' : 'failure'; |
|
104 | + $meta['statuscode'] = $this->statusCode; |
|
105 | + $meta['message'] = $this->message; |
|
106 | + if (isset($this->items)) { |
|
107 | + $meta['totalitems'] = $this->items; |
|
108 | + } |
|
109 | + if (isset($this->perPage)) { |
|
110 | + $meta['itemsperpage'] = $this->perPage; |
|
111 | + } |
|
112 | + return $meta; |
|
113 | + } |
|
114 | + |
|
115 | + /** |
|
116 | + * get the result data |
|
117 | + * @return array |
|
118 | + */ |
|
119 | + public function getData() { |
|
120 | + return $this->data; |
|
121 | + } |
|
122 | + |
|
123 | + /** |
|
124 | + * return bool Whether the method succeeded |
|
125 | + * @return bool |
|
126 | + */ |
|
127 | + public function succeeded() { |
|
128 | + return ($this->statusCode == 100); |
|
129 | + } |
|
130 | + |
|
131 | + /** |
|
132 | + * Adds a new header to the response |
|
133 | + * @param string $name The name of the HTTP header |
|
134 | + * @param string $value The value, null will delete it |
|
135 | + * @return $this |
|
136 | + */ |
|
137 | + public function addHeader($name, $value) { |
|
138 | + $name = trim($name); // always remove leading and trailing whitespace |
|
139 | + // to be able to reliably check for security |
|
140 | + // headers |
|
141 | + |
|
142 | + if (is_null($value)) { |
|
143 | + unset($this->headers[$name]); |
|
144 | + } else { |
|
145 | + $this->headers[$name] = $value; |
|
146 | + } |
|
147 | + |
|
148 | + return $this; |
|
149 | + } |
|
150 | + |
|
151 | + /** |
|
152 | + * Returns the set headers |
|
153 | + * @return array the headers |
|
154 | + */ |
|
155 | + public function getHeaders() { |
|
156 | + return $this->headers; |
|
157 | + } |
|
158 | 158 | } |
@@ -33,53 +33,53 @@ |
||
33 | 33 | namespace OC\Files\Storage; |
34 | 34 | |
35 | 35 | class CommonTest extends \OC\Files\Storage\Common { |
36 | - /** |
|
37 | - * underlying local storage used for missing functions |
|
38 | - * @var \OC\Files\Storage\Local |
|
39 | - */ |
|
40 | - private $storage; |
|
36 | + /** |
|
37 | + * underlying local storage used for missing functions |
|
38 | + * @var \OC\Files\Storage\Local |
|
39 | + */ |
|
40 | + private $storage; |
|
41 | 41 | |
42 | - public function __construct($params) { |
|
43 | - $this->storage = new \OC\Files\Storage\Local($params); |
|
44 | - } |
|
42 | + public function __construct($params) { |
|
43 | + $this->storage = new \OC\Files\Storage\Local($params); |
|
44 | + } |
|
45 | 45 | |
46 | - public function getId() { |
|
47 | - return 'test::'.$this->storage->getId(); |
|
48 | - } |
|
49 | - public function mkdir($path) { |
|
50 | - return $this->storage->mkdir($path); |
|
51 | - } |
|
52 | - public function rmdir($path) { |
|
53 | - return $this->storage->rmdir($path); |
|
54 | - } |
|
55 | - public function opendir($path) { |
|
56 | - return $this->storage->opendir($path); |
|
57 | - } |
|
58 | - public function stat($path) { |
|
59 | - return $this->storage->stat($path); |
|
60 | - } |
|
61 | - public function filetype($path) { |
|
62 | - return @$this->storage->filetype($path); |
|
63 | - } |
|
64 | - public function isReadable($path) { |
|
65 | - return $this->storage->isReadable($path); |
|
66 | - } |
|
67 | - public function isUpdatable($path) { |
|
68 | - return $this->storage->isUpdatable($path); |
|
69 | - } |
|
70 | - public function file_exists($path) { |
|
71 | - return $this->storage->file_exists($path); |
|
72 | - } |
|
73 | - public function unlink($path) { |
|
74 | - return $this->storage->unlink($path); |
|
75 | - } |
|
76 | - public function fopen($path, $mode) { |
|
77 | - return $this->storage->fopen($path, $mode); |
|
78 | - } |
|
79 | - public function free_space($path) { |
|
80 | - return $this->storage->free_space($path); |
|
81 | - } |
|
82 | - public function touch($path, $mtime = null) { |
|
83 | - return $this->storage->touch($path, $mtime); |
|
84 | - } |
|
46 | + public function getId() { |
|
47 | + return 'test::'.$this->storage->getId(); |
|
48 | + } |
|
49 | + public function mkdir($path) { |
|
50 | + return $this->storage->mkdir($path); |
|
51 | + } |
|
52 | + public function rmdir($path) { |
|
53 | + return $this->storage->rmdir($path); |
|
54 | + } |
|
55 | + public function opendir($path) { |
|
56 | + return $this->storage->opendir($path); |
|
57 | + } |
|
58 | + public function stat($path) { |
|
59 | + return $this->storage->stat($path); |
|
60 | + } |
|
61 | + public function filetype($path) { |
|
62 | + return @$this->storage->filetype($path); |
|
63 | + } |
|
64 | + public function isReadable($path) { |
|
65 | + return $this->storage->isReadable($path); |
|
66 | + } |
|
67 | + public function isUpdatable($path) { |
|
68 | + return $this->storage->isUpdatable($path); |
|
69 | + } |
|
70 | + public function file_exists($path) { |
|
71 | + return $this->storage->file_exists($path); |
|
72 | + } |
|
73 | + public function unlink($path) { |
|
74 | + return $this->storage->unlink($path); |
|
75 | + } |
|
76 | + public function fopen($path, $mode) { |
|
77 | + return $this->storage->fopen($path, $mode); |
|
78 | + } |
|
79 | + public function free_space($path) { |
|
80 | + return $this->storage->free_space($path); |
|
81 | + } |
|
82 | + public function touch($path, $mtime = null) { |
|
83 | + return $this->storage->touch($path, $mtime); |
|
84 | + } |
|
85 | 85 | } |
@@ -29,20 +29,20 @@ |
||
29 | 29 | * local storage backend in temporary folder for testing purpose |
30 | 30 | */ |
31 | 31 | class Temporary extends Local { |
32 | - public function __construct($arguments = null) { |
|
33 | - parent::__construct(['datadir' => \OC::$server->getTempManager()->getTemporaryFolder()]); |
|
34 | - } |
|
32 | + public function __construct($arguments = null) { |
|
33 | + parent::__construct(['datadir' => \OC::$server->getTempManager()->getTemporaryFolder()]); |
|
34 | + } |
|
35 | 35 | |
36 | - public function cleanUp() { |
|
37 | - \OC_Helper::rmdirr($this->datadir); |
|
38 | - } |
|
36 | + public function cleanUp() { |
|
37 | + \OC_Helper::rmdirr($this->datadir); |
|
38 | + } |
|
39 | 39 | |
40 | - public function __destruct() { |
|
41 | - parent::__destruct(); |
|
42 | - $this->cleanUp(); |
|
43 | - } |
|
40 | + public function __destruct() { |
|
41 | + parent::__destruct(); |
|
42 | + $this->cleanUp(); |
|
43 | + } |
|
44 | 44 | |
45 | - public function getDataDir() { |
|
46 | - return $this->datadir; |
|
47 | - } |
|
45 | + public function getDataDir() { |
|
46 | + return $this->datadir; |
|
47 | + } |
|
48 | 48 | } |
@@ -33,70 +33,70 @@ |
||
33 | 33 | * usage: resource \OC\Files\Stream\Quota::wrap($stream, $limit) |
34 | 34 | */ |
35 | 35 | class Quota extends Wrapper { |
36 | - /** |
|
37 | - * @var int $limit |
|
38 | - */ |
|
39 | - private $limit; |
|
36 | + /** |
|
37 | + * @var int $limit |
|
38 | + */ |
|
39 | + private $limit; |
|
40 | 40 | |
41 | - /** |
|
42 | - * @param resource $stream |
|
43 | - * @param int $limit |
|
44 | - * @return resource |
|
45 | - */ |
|
46 | - public static function wrap($stream, $limit) { |
|
47 | - $context = stream_context_create([ |
|
48 | - 'quota' => [ |
|
49 | - 'source' => $stream, |
|
50 | - 'limit' => $limit |
|
51 | - ] |
|
52 | - ]); |
|
53 | - return Wrapper::wrapSource($stream, $context, 'quota', self::class); |
|
54 | - } |
|
41 | + /** |
|
42 | + * @param resource $stream |
|
43 | + * @param int $limit |
|
44 | + * @return resource |
|
45 | + */ |
|
46 | + public static function wrap($stream, $limit) { |
|
47 | + $context = stream_context_create([ |
|
48 | + 'quota' => [ |
|
49 | + 'source' => $stream, |
|
50 | + 'limit' => $limit |
|
51 | + ] |
|
52 | + ]); |
|
53 | + return Wrapper::wrapSource($stream, $context, 'quota', self::class); |
|
54 | + } |
|
55 | 55 | |
56 | - public function stream_open($path, $mode, $options, &$opened_path) { |
|
57 | - $context = $this->loadContext('quota'); |
|
58 | - $this->source = $context['source']; |
|
59 | - $this->limit = $context['limit']; |
|
56 | + public function stream_open($path, $mode, $options, &$opened_path) { |
|
57 | + $context = $this->loadContext('quota'); |
|
58 | + $this->source = $context['source']; |
|
59 | + $this->limit = $context['limit']; |
|
60 | 60 | |
61 | - return true; |
|
62 | - } |
|
61 | + return true; |
|
62 | + } |
|
63 | 63 | |
64 | - public function dir_opendir($path, $options) { |
|
65 | - return false; |
|
66 | - } |
|
64 | + public function dir_opendir($path, $options) { |
|
65 | + return false; |
|
66 | + } |
|
67 | 67 | |
68 | - public function stream_seek($offset, $whence = SEEK_SET) { |
|
69 | - if ($whence === SEEK_END) { |
|
70 | - // go to the end to find out last position's offset |
|
71 | - $oldOffset = $this->stream_tell(); |
|
72 | - if (fseek($this->source, 0, $whence) !== 0) { |
|
73 | - return false; |
|
74 | - } |
|
75 | - $whence = SEEK_SET; |
|
76 | - $offset = $this->stream_tell() + $offset; |
|
77 | - $this->limit += $oldOffset - $offset; |
|
78 | - } elseif ($whence === SEEK_SET) { |
|
79 | - $this->limit += $this->stream_tell() - $offset; |
|
80 | - } else { |
|
81 | - $this->limit -= $offset; |
|
82 | - } |
|
83 | - // this wrapper needs to return "true" for success. |
|
84 | - // the fseek call itself returns 0 on succeess |
|
85 | - return fseek($this->source, $offset, $whence) === 0; |
|
86 | - } |
|
68 | + public function stream_seek($offset, $whence = SEEK_SET) { |
|
69 | + if ($whence === SEEK_END) { |
|
70 | + // go to the end to find out last position's offset |
|
71 | + $oldOffset = $this->stream_tell(); |
|
72 | + if (fseek($this->source, 0, $whence) !== 0) { |
|
73 | + return false; |
|
74 | + } |
|
75 | + $whence = SEEK_SET; |
|
76 | + $offset = $this->stream_tell() + $offset; |
|
77 | + $this->limit += $oldOffset - $offset; |
|
78 | + } elseif ($whence === SEEK_SET) { |
|
79 | + $this->limit += $this->stream_tell() - $offset; |
|
80 | + } else { |
|
81 | + $this->limit -= $offset; |
|
82 | + } |
|
83 | + // this wrapper needs to return "true" for success. |
|
84 | + // the fseek call itself returns 0 on succeess |
|
85 | + return fseek($this->source, $offset, $whence) === 0; |
|
86 | + } |
|
87 | 87 | |
88 | - public function stream_read($count) { |
|
89 | - $this->limit -= $count; |
|
90 | - return fread($this->source, $count); |
|
91 | - } |
|
88 | + public function stream_read($count) { |
|
89 | + $this->limit -= $count; |
|
90 | + return fread($this->source, $count); |
|
91 | + } |
|
92 | 92 | |
93 | - public function stream_write($data) { |
|
94 | - $size = strlen($data); |
|
95 | - if ($size > $this->limit) { |
|
96 | - $data = substr($data, 0, $this->limit); |
|
97 | - $size = $this->limit; |
|
98 | - } |
|
99 | - $this->limit -= $size; |
|
100 | - return fwrite($this->source, $data); |
|
101 | - } |
|
93 | + public function stream_write($data) { |
|
94 | + $size = strlen($data); |
|
95 | + if ($size > $this->limit) { |
|
96 | + $data = substr($data, 0, $this->limit); |
|
97 | + $size = $this->limit; |
|
98 | + } |
|
99 | + $this->limit -= $size; |
|
100 | + return fwrite($this->source, $data); |
|
101 | + } |
|
102 | 102 | } |
@@ -28,40 +28,40 @@ |
||
28 | 28 | |
29 | 29 | class HomeObjectStoreStorage extends ObjectStoreStorage implements \OCP\Files\IHomeStorage { |
30 | 30 | |
31 | - /** |
|
32 | - * The home user storage requires a user object to create a unique storage id |
|
33 | - * @param array $params |
|
34 | - */ |
|
35 | - public function __construct($params) { |
|
36 | - if (! isset($params['user']) || ! $params['user'] instanceof User) { |
|
37 | - throw new \Exception('missing user object in parameters'); |
|
38 | - } |
|
39 | - $this->user = $params['user']; |
|
40 | - parent::__construct($params); |
|
41 | - } |
|
31 | + /** |
|
32 | + * The home user storage requires a user object to create a unique storage id |
|
33 | + * @param array $params |
|
34 | + */ |
|
35 | + public function __construct($params) { |
|
36 | + if (! isset($params['user']) || ! $params['user'] instanceof User) { |
|
37 | + throw new \Exception('missing user object in parameters'); |
|
38 | + } |
|
39 | + $this->user = $params['user']; |
|
40 | + parent::__construct($params); |
|
41 | + } |
|
42 | 42 | |
43 | - public function getId() { |
|
44 | - return 'object::user:' . $this->user->getUID(); |
|
45 | - } |
|
43 | + public function getId() { |
|
44 | + return 'object::user:' . $this->user->getUID(); |
|
45 | + } |
|
46 | 46 | |
47 | - /** |
|
48 | - * get the owner of a path |
|
49 | - * |
|
50 | - * @param string $path The path to get the owner |
|
51 | - * @return false|string uid |
|
52 | - */ |
|
53 | - public function getOwner($path) { |
|
54 | - if (is_object($this->user)) { |
|
55 | - return $this->user->getUID(); |
|
56 | - } |
|
57 | - return false; |
|
58 | - } |
|
47 | + /** |
|
48 | + * get the owner of a path |
|
49 | + * |
|
50 | + * @param string $path The path to get the owner |
|
51 | + * @return false|string uid |
|
52 | + */ |
|
53 | + public function getOwner($path) { |
|
54 | + if (is_object($this->user)) { |
|
55 | + return $this->user->getUID(); |
|
56 | + } |
|
57 | + return false; |
|
58 | + } |
|
59 | 59 | |
60 | - /** |
|
61 | - * @param string $path, optional |
|
62 | - * @return \OC\User\User |
|
63 | - */ |
|
64 | - public function getUser($path = null) { |
|
65 | - return $this->user; |
|
66 | - } |
|
60 | + /** |
|
61 | + * @param string $path, optional |
|
62 | + * @return \OC\User\User |
|
63 | + */ |
|
64 | + public function getUser($path = null) { |
|
65 | + return $this->user; |
|
66 | + } |
|
67 | 67 | } |
@@ -24,17 +24,17 @@ |
||
24 | 24 | namespace OC\DB; |
25 | 25 | |
26 | 26 | class MigrationException extends \Exception { |
27 | - private $table; |
|
27 | + private $table; |
|
28 | 28 | |
29 | - public function __construct($table, $message) { |
|
30 | - $this->table = $table; |
|
31 | - parent::__construct($message); |
|
32 | - } |
|
29 | + public function __construct($table, $message) { |
|
30 | + $this->table = $table; |
|
31 | + parent::__construct($message); |
|
32 | + } |
|
33 | 33 | |
34 | - /** |
|
35 | - * @return string |
|
36 | - */ |
|
37 | - public function getTable() { |
|
38 | - return $this->table; |
|
39 | - } |
|
34 | + /** |
|
35 | + * @return string |
|
36 | + */ |
|
37 | + public function getTable() { |
|
38 | + return $this->table; |
|
39 | + } |
|
40 | 40 | } |
@@ -25,68 +25,68 @@ |
||
25 | 25 | use OCP\DB\QueryBuilder\ICompositeExpression; |
26 | 26 | |
27 | 27 | class CompositeExpression implements ICompositeExpression, \Countable { |
28 | - /** @var \Doctrine\DBAL\Query\Expression\CompositeExpression */ |
|
29 | - protected $compositeExpression; |
|
28 | + /** @var \Doctrine\DBAL\Query\Expression\CompositeExpression */ |
|
29 | + protected $compositeExpression; |
|
30 | 30 | |
31 | - /** |
|
32 | - * Constructor. |
|
33 | - * |
|
34 | - * @param \Doctrine\DBAL\Query\Expression\CompositeExpression $compositeExpression |
|
35 | - */ |
|
36 | - public function __construct(\Doctrine\DBAL\Query\Expression\CompositeExpression $compositeExpression) { |
|
37 | - $this->compositeExpression = $compositeExpression; |
|
38 | - } |
|
31 | + /** |
|
32 | + * Constructor. |
|
33 | + * |
|
34 | + * @param \Doctrine\DBAL\Query\Expression\CompositeExpression $compositeExpression |
|
35 | + */ |
|
36 | + public function __construct(\Doctrine\DBAL\Query\Expression\CompositeExpression $compositeExpression) { |
|
37 | + $this->compositeExpression = $compositeExpression; |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * Adds multiple parts to composite expression. |
|
42 | - * |
|
43 | - * @param array $parts |
|
44 | - * |
|
45 | - * @return \OCP\DB\QueryBuilder\ICompositeExpression |
|
46 | - */ |
|
47 | - public function addMultiple(array $parts = []) { |
|
48 | - $this->compositeExpression->addMultiple($parts); |
|
40 | + /** |
|
41 | + * Adds multiple parts to composite expression. |
|
42 | + * |
|
43 | + * @param array $parts |
|
44 | + * |
|
45 | + * @return \OCP\DB\QueryBuilder\ICompositeExpression |
|
46 | + */ |
|
47 | + public function addMultiple(array $parts = []) { |
|
48 | + $this->compositeExpression->addMultiple($parts); |
|
49 | 49 | |
50 | - return $this; |
|
51 | - } |
|
50 | + return $this; |
|
51 | + } |
|
52 | 52 | |
53 | - /** |
|
54 | - * Adds an expression to composite expression. |
|
55 | - * |
|
56 | - * @param mixed $part |
|
57 | - * |
|
58 | - * @return \OCP\DB\QueryBuilder\ICompositeExpression |
|
59 | - */ |
|
60 | - public function add($part) { |
|
61 | - $this->compositeExpression->add($part); |
|
53 | + /** |
|
54 | + * Adds an expression to composite expression. |
|
55 | + * |
|
56 | + * @param mixed $part |
|
57 | + * |
|
58 | + * @return \OCP\DB\QueryBuilder\ICompositeExpression |
|
59 | + */ |
|
60 | + public function add($part) { |
|
61 | + $this->compositeExpression->add($part); |
|
62 | 62 | |
63 | - return $this; |
|
64 | - } |
|
63 | + return $this; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * Retrieves the amount of expressions on composite expression. |
|
68 | - * |
|
69 | - * @return integer |
|
70 | - */ |
|
71 | - public function count() { |
|
72 | - return $this->compositeExpression->count(); |
|
73 | - } |
|
66 | + /** |
|
67 | + * Retrieves the amount of expressions on composite expression. |
|
68 | + * |
|
69 | + * @return integer |
|
70 | + */ |
|
71 | + public function count() { |
|
72 | + return $this->compositeExpression->count(); |
|
73 | + } |
|
74 | 74 | |
75 | - /** |
|
76 | - * Returns the type of this composite expression (AND/OR). |
|
77 | - * |
|
78 | - * @return string |
|
79 | - */ |
|
80 | - public function getType() { |
|
81 | - return $this->compositeExpression->getType(); |
|
82 | - } |
|
75 | + /** |
|
76 | + * Returns the type of this composite expression (AND/OR). |
|
77 | + * |
|
78 | + * @return string |
|
79 | + */ |
|
80 | + public function getType() { |
|
81 | + return $this->compositeExpression->getType(); |
|
82 | + } |
|
83 | 83 | |
84 | - /** |
|
85 | - * Retrieves the string representation of this composite expression. |
|
86 | - * |
|
87 | - * @return string |
|
88 | - */ |
|
89 | - public function __toString() { |
|
90 | - return (string) $this->compositeExpression; |
|
91 | - } |
|
84 | + /** |
|
85 | + * Retrieves the string representation of this composite expression. |
|
86 | + * |
|
87 | + * @return string |
|
88 | + */ |
|
89 | + public function __toString() { |
|
90 | + return (string) $this->compositeExpression; |
|
91 | + } |
|
92 | 92 | } |
@@ -25,17 +25,17 @@ |
||
25 | 25 | use OCP\DB\QueryBuilder\ILiteral; |
26 | 26 | |
27 | 27 | class Literal implements ILiteral { |
28 | - /** @var mixed */ |
|
29 | - protected $literal; |
|
28 | + /** @var mixed */ |
|
29 | + protected $literal; |
|
30 | 30 | |
31 | - public function __construct($literal) { |
|
32 | - $this->literal = $literal; |
|
33 | - } |
|
31 | + public function __construct($literal) { |
|
32 | + $this->literal = $literal; |
|
33 | + } |
|
34 | 34 | |
35 | - /** |
|
36 | - * @return string |
|
37 | - */ |
|
38 | - public function __toString() { |
|
39 | - return (string) $this->literal; |
|
40 | - } |
|
35 | + /** |
|
36 | + * @return string |
|
37 | + */ |
|
38 | + public function __toString() { |
|
39 | + return (string) $this->literal; |
|
40 | + } |
|
41 | 41 | } |
@@ -29,47 +29,47 @@ |
||
29 | 29 | use Doctrine\DBAL\Schema\Table; |
30 | 30 | |
31 | 31 | class MySQLMigrator extends Migrator { |
32 | - /** |
|
33 | - * @param Schema $targetSchema |
|
34 | - * @param \Doctrine\DBAL\Connection $connection |
|
35 | - * @return \Doctrine\DBAL\Schema\SchemaDiff |
|
36 | - */ |
|
37 | - protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) { |
|
38 | - $platform = $connection->getDatabasePlatform(); |
|
39 | - $platform->registerDoctrineTypeMapping('enum', 'string'); |
|
40 | - $platform->registerDoctrineTypeMapping('bit', 'string'); |
|
32 | + /** |
|
33 | + * @param Schema $targetSchema |
|
34 | + * @param \Doctrine\DBAL\Connection $connection |
|
35 | + * @return \Doctrine\DBAL\Schema\SchemaDiff |
|
36 | + */ |
|
37 | + protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) { |
|
38 | + $platform = $connection->getDatabasePlatform(); |
|
39 | + $platform->registerDoctrineTypeMapping('enum', 'string'); |
|
40 | + $platform->registerDoctrineTypeMapping('bit', 'string'); |
|
41 | 41 | |
42 | - $schemaDiff = parent::getDiff($targetSchema, $connection); |
|
42 | + $schemaDiff = parent::getDiff($targetSchema, $connection); |
|
43 | 43 | |
44 | - // identifiers need to be quoted for mysql |
|
45 | - foreach ($schemaDiff->changedTables as $tableDiff) { |
|
46 | - $tableDiff->name = $this->connection->quoteIdentifier($tableDiff->name); |
|
47 | - foreach ($tableDiff->changedColumns as $column) { |
|
48 | - $column->oldColumnName = $this->connection->quoteIdentifier($column->oldColumnName); |
|
49 | - } |
|
50 | - } |
|
44 | + // identifiers need to be quoted for mysql |
|
45 | + foreach ($schemaDiff->changedTables as $tableDiff) { |
|
46 | + $tableDiff->name = $this->connection->quoteIdentifier($tableDiff->name); |
|
47 | + foreach ($tableDiff->changedColumns as $column) { |
|
48 | + $column->oldColumnName = $this->connection->quoteIdentifier($column->oldColumnName); |
|
49 | + } |
|
50 | + } |
|
51 | 51 | |
52 | - return $schemaDiff; |
|
53 | - } |
|
52 | + return $schemaDiff; |
|
53 | + } |
|
54 | 54 | |
55 | - /** |
|
56 | - * Speed up migration test by disabling autocommit and unique indexes check |
|
57 | - * |
|
58 | - * @param \Doctrine\DBAL\Schema\Table $table |
|
59 | - * @throws \OC\DB\MigrationException |
|
60 | - */ |
|
61 | - protected function checkTableMigrate(Table $table) { |
|
62 | - $this->connection->exec('SET autocommit=0'); |
|
63 | - $this->connection->exec('SET unique_checks=0'); |
|
55 | + /** |
|
56 | + * Speed up migration test by disabling autocommit and unique indexes check |
|
57 | + * |
|
58 | + * @param \Doctrine\DBAL\Schema\Table $table |
|
59 | + * @throws \OC\DB\MigrationException |
|
60 | + */ |
|
61 | + protected function checkTableMigrate(Table $table) { |
|
62 | + $this->connection->exec('SET autocommit=0'); |
|
63 | + $this->connection->exec('SET unique_checks=0'); |
|
64 | 64 | |
65 | - try { |
|
66 | - parent::checkTableMigrate($table); |
|
67 | - } catch (\Exception $e) { |
|
68 | - $this->connection->exec('SET unique_checks=1'); |
|
69 | - $this->connection->exec('SET autocommit=1'); |
|
70 | - throw new MigrationException($table->getName(), $e->getMessage()); |
|
71 | - } |
|
72 | - $this->connection->exec('SET unique_checks=1'); |
|
73 | - $this->connection->exec('SET autocommit=1'); |
|
74 | - } |
|
65 | + try { |
|
66 | + parent::checkTableMigrate($table); |
|
67 | + } catch (\Exception $e) { |
|
68 | + $this->connection->exec('SET unique_checks=1'); |
|
69 | + $this->connection->exec('SET autocommit=1'); |
|
70 | + throw new MigrationException($table->getName(), $e->getMessage()); |
|
71 | + } |
|
72 | + $this->connection->exec('SET unique_checks=1'); |
|
73 | + $this->connection->exec('SET autocommit=1'); |
|
74 | + } |
|
75 | 75 | } |