@@ -34,7 +34,7 @@ |
||
34 | 34 | * @package OC\AppFramework\Middleware\Security\Exceptions |
35 | 35 | */ |
36 | 36 | class NotLoggedInException extends SecurityException { |
37 | - public function __construct() { |
|
38 | - parent::__construct('Current user is not logged in', Http::STATUS_UNAUTHORIZED); |
|
39 | - } |
|
37 | + public function __construct() { |
|
38 | + parent::__construct('Current user is not logged in', Http::STATUS_UNAUTHORIZED); |
|
39 | + } |
|
40 | 40 | } |
@@ -29,50 +29,50 @@ |
||
29 | 29 | |
30 | 30 | class FixMountStorages implements IRepairStep { |
31 | 31 | |
32 | - /** @var IDBConnection */ |
|
33 | - private $db; |
|
32 | + /** @var IDBConnection */ |
|
33 | + private $db; |
|
34 | 34 | |
35 | - /** |
|
36 | - * @param IDBConnection $db |
|
37 | - */ |
|
38 | - public function __construct(IDBConnection $db) { |
|
39 | - $this->db = $db; |
|
40 | - } |
|
35 | + /** |
|
36 | + * @param IDBConnection $db |
|
37 | + */ |
|
38 | + public function __construct(IDBConnection $db) { |
|
39 | + $this->db = $db; |
|
40 | + } |
|
41 | 41 | |
42 | - /** |
|
43 | - * @return string |
|
44 | - */ |
|
45 | - public function getName() { |
|
46 | - return 'Fix potential broken mount points'; |
|
47 | - } |
|
42 | + /** |
|
43 | + * @return string |
|
44 | + */ |
|
45 | + public function getName() { |
|
46 | + return 'Fix potential broken mount points'; |
|
47 | + } |
|
48 | 48 | |
49 | - public function run(IOutput $output) { |
|
50 | - $query = $this->db->getQueryBuilder(); |
|
51 | - $query->select('m.id', 'f.storage') |
|
52 | - ->from('mounts', 'm') |
|
53 | - ->leftJoin('m', 'filecache', 'f', $query->expr()->eq('m.root_id', 'f.fileid')) |
|
54 | - ->where($query->expr()->neq('m.storage_id', 'f.storage')); |
|
49 | + public function run(IOutput $output) { |
|
50 | + $query = $this->db->getQueryBuilder(); |
|
51 | + $query->select('m.id', 'f.storage') |
|
52 | + ->from('mounts', 'm') |
|
53 | + ->leftJoin('m', 'filecache', 'f', $query->expr()->eq('m.root_id', 'f.fileid')) |
|
54 | + ->where($query->expr()->neq('m.storage_id', 'f.storage')); |
|
55 | 55 | |
56 | - $update = $this->db->getQueryBuilder(); |
|
57 | - $update->update('mounts') |
|
58 | - ->set('storage_id', $update->createParameter('storage')) |
|
59 | - ->where($query->expr()->eq('id', $update->createParameter('mount'))); |
|
56 | + $update = $this->db->getQueryBuilder(); |
|
57 | + $update->update('mounts') |
|
58 | + ->set('storage_id', $update->createParameter('storage')) |
|
59 | + ->where($query->expr()->eq('id', $update->createParameter('mount'))); |
|
60 | 60 | |
61 | - $result = $query->execute(); |
|
62 | - $entriesUpdated = 0; |
|
63 | - while ($row = $result->fetch()) { |
|
64 | - $update->setParameter('storage', $row['storage'], IQueryBuilder::PARAM_INT) |
|
65 | - ->setParameter('mount', $row['id'], IQueryBuilder::PARAM_INT); |
|
66 | - $update->execute(); |
|
67 | - $entriesUpdated++; |
|
68 | - } |
|
69 | - $result->closeCursor(); |
|
61 | + $result = $query->execute(); |
|
62 | + $entriesUpdated = 0; |
|
63 | + while ($row = $result->fetch()) { |
|
64 | + $update->setParameter('storage', $row['storage'], IQueryBuilder::PARAM_INT) |
|
65 | + ->setParameter('mount', $row['id'], IQueryBuilder::PARAM_INT); |
|
66 | + $update->execute(); |
|
67 | + $entriesUpdated++; |
|
68 | + } |
|
69 | + $result->closeCursor(); |
|
70 | 70 | |
71 | - if ($entriesUpdated > 0) { |
|
72 | - $output->info($entriesUpdated . ' mounts updated'); |
|
73 | - return; |
|
74 | - } |
|
71 | + if ($entriesUpdated > 0) { |
|
72 | + $output->info($entriesUpdated . ' mounts updated'); |
|
73 | + return; |
|
74 | + } |
|
75 | 75 | |
76 | - $output->info('No mounts updated'); |
|
77 | - } |
|
76 | + $output->info('No mounts updated'); |
|
77 | + } |
|
78 | 78 | } |
@@ -69,7 +69,7 @@ |
||
69 | 69 | $result->closeCursor(); |
70 | 70 | |
71 | 71 | if ($entriesUpdated > 0) { |
72 | - $output->info($entriesUpdated . ' mounts updated'); |
|
72 | + $output->info($entriesUpdated.' mounts updated'); |
|
73 | 73 | return; |
74 | 74 | } |
75 | 75 |
@@ -93,7 +93,7 @@ |
||
93 | 93 | $result->closeCursor(); |
94 | 94 | |
95 | 95 | if ($deletedEntries) { |
96 | - $output->info('Removed ' . $deletedEntries . ' shares where user is not a member of the group anymore'); |
|
96 | + $output->info('Removed '.$deletedEntries.' shares where user is not a member of the group anymore'); |
|
97 | 97 | } |
98 | 98 | } |
99 | 99 |
@@ -30,88 +30,88 @@ |
||
30 | 30 | |
31 | 31 | class OldGroupMembershipShares implements IRepairStep { |
32 | 32 | |
33 | - /** @var \OCP\IDBConnection */ |
|
34 | - protected $connection; |
|
33 | + /** @var \OCP\IDBConnection */ |
|
34 | + protected $connection; |
|
35 | 35 | |
36 | - /** @var \OCP\IGroupManager */ |
|
37 | - protected $groupManager; |
|
36 | + /** @var \OCP\IGroupManager */ |
|
37 | + protected $groupManager; |
|
38 | 38 | |
39 | - /** |
|
40 | - * @var array [gid => [uid => (bool)]] |
|
41 | - */ |
|
42 | - protected $memberships; |
|
39 | + /** |
|
40 | + * @var array [gid => [uid => (bool)]] |
|
41 | + */ |
|
42 | + protected $memberships; |
|
43 | 43 | |
44 | - /** |
|
45 | - * @param IDBConnection $connection |
|
46 | - * @param IGroupManager $groupManager |
|
47 | - */ |
|
48 | - public function __construct(IDBConnection $connection, IGroupManager $groupManager) { |
|
49 | - $this->connection = $connection; |
|
50 | - $this->groupManager = $groupManager; |
|
51 | - } |
|
44 | + /** |
|
45 | + * @param IDBConnection $connection |
|
46 | + * @param IGroupManager $groupManager |
|
47 | + */ |
|
48 | + public function __construct(IDBConnection $connection, IGroupManager $groupManager) { |
|
49 | + $this->connection = $connection; |
|
50 | + $this->groupManager = $groupManager; |
|
51 | + } |
|
52 | 52 | |
53 | - /** |
|
54 | - * Returns the step's name |
|
55 | - * |
|
56 | - * @return string |
|
57 | - */ |
|
58 | - public function getName() { |
|
59 | - return 'Remove shares of old group memberships'; |
|
60 | - } |
|
53 | + /** |
|
54 | + * Returns the step's name |
|
55 | + * |
|
56 | + * @return string |
|
57 | + */ |
|
58 | + public function getName() { |
|
59 | + return 'Remove shares of old group memberships'; |
|
60 | + } |
|
61 | 61 | |
62 | - /** |
|
63 | - * Run repair step. |
|
64 | - * Must throw exception on error. |
|
65 | - * |
|
66 | - * @throws \Exception in case of failure |
|
67 | - */ |
|
68 | - public function run(IOutput $output) { |
|
69 | - $deletedEntries = 0; |
|
62 | + /** |
|
63 | + * Run repair step. |
|
64 | + * Must throw exception on error. |
|
65 | + * |
|
66 | + * @throws \Exception in case of failure |
|
67 | + */ |
|
68 | + public function run(IOutput $output) { |
|
69 | + $deletedEntries = 0; |
|
70 | 70 | |
71 | - $query = $this->connection->getQueryBuilder(); |
|
72 | - $query->select('s1.id')->selectAlias('s1.share_with', 'user')->selectAlias('s2.share_with', 'group') |
|
73 | - ->from('share', 's1') |
|
74 | - ->where($query->expr()->isNotNull('s1.parent')) |
|
75 | - // \OC\Share\Constant::$shareTypeGroupUserUnique === 2 |
|
76 | - ->andWhere($query->expr()->eq('s1.share_type', $query->expr()->literal(2))) |
|
77 | - ->andWhere($query->expr()->isNotNull('s2.id')) |
|
78 | - ->andWhere($query->expr()->eq('s2.share_type', $query->expr()->literal(IShare::TYPE_GROUP))) |
|
79 | - ->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id')); |
|
71 | + $query = $this->connection->getQueryBuilder(); |
|
72 | + $query->select('s1.id')->selectAlias('s1.share_with', 'user')->selectAlias('s2.share_with', 'group') |
|
73 | + ->from('share', 's1') |
|
74 | + ->where($query->expr()->isNotNull('s1.parent')) |
|
75 | + // \OC\Share\Constant::$shareTypeGroupUserUnique === 2 |
|
76 | + ->andWhere($query->expr()->eq('s1.share_type', $query->expr()->literal(2))) |
|
77 | + ->andWhere($query->expr()->isNotNull('s2.id')) |
|
78 | + ->andWhere($query->expr()->eq('s2.share_type', $query->expr()->literal(IShare::TYPE_GROUP))) |
|
79 | + ->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id')); |
|
80 | 80 | |
81 | - $deleteQuery = $this->connection->getQueryBuilder(); |
|
82 | - $deleteQuery->delete('share') |
|
83 | - ->where($query->expr()->eq('id', $deleteQuery->createParameter('share'))); |
|
81 | + $deleteQuery = $this->connection->getQueryBuilder(); |
|
82 | + $deleteQuery->delete('share') |
|
83 | + ->where($query->expr()->eq('id', $deleteQuery->createParameter('share'))); |
|
84 | 84 | |
85 | - $result = $query->execute(); |
|
86 | - while ($row = $result->fetch()) { |
|
87 | - if (!$this->isMember($row['group'], $row['user'])) { |
|
88 | - $deletedEntries += $deleteQuery->setParameter('share', (int) $row['id']) |
|
89 | - ->execute(); |
|
90 | - } |
|
91 | - } |
|
92 | - $result->closeCursor(); |
|
85 | + $result = $query->execute(); |
|
86 | + while ($row = $result->fetch()) { |
|
87 | + if (!$this->isMember($row['group'], $row['user'])) { |
|
88 | + $deletedEntries += $deleteQuery->setParameter('share', (int) $row['id']) |
|
89 | + ->execute(); |
|
90 | + } |
|
91 | + } |
|
92 | + $result->closeCursor(); |
|
93 | 93 | |
94 | - if ($deletedEntries) { |
|
95 | - $output->info('Removed ' . $deletedEntries . ' shares where user is not a member of the group anymore'); |
|
96 | - } |
|
97 | - } |
|
94 | + if ($deletedEntries) { |
|
95 | + $output->info('Removed ' . $deletedEntries . ' shares where user is not a member of the group anymore'); |
|
96 | + } |
|
97 | + } |
|
98 | 98 | |
99 | - /** |
|
100 | - * @param string $gid |
|
101 | - * @param string $uid |
|
102 | - * @return bool |
|
103 | - */ |
|
104 | - protected function isMember($gid, $uid) { |
|
105 | - if (isset($this->memberships[$gid][$uid])) { |
|
106 | - return $this->memberships[$gid][$uid]; |
|
107 | - } |
|
99 | + /** |
|
100 | + * @param string $gid |
|
101 | + * @param string $uid |
|
102 | + * @return bool |
|
103 | + */ |
|
104 | + protected function isMember($gid, $uid) { |
|
105 | + if (isset($this->memberships[$gid][$uid])) { |
|
106 | + return $this->memberships[$gid][$uid]; |
|
107 | + } |
|
108 | 108 | |
109 | - $isMember = $this->groupManager->isInGroup($uid, $gid); |
|
110 | - if (!isset($this->memberships[$gid])) { |
|
111 | - $this->memberships[$gid] = []; |
|
112 | - } |
|
113 | - $this->memberships[$gid][$uid] = $isMember; |
|
109 | + $isMember = $this->groupManager->isInGroup($uid, $gid); |
|
110 | + if (!isset($this->memberships[$gid])) { |
|
111 | + $this->memberships[$gid] = []; |
|
112 | + } |
|
113 | + $this->memberships[$gid][$uid] = $isMember; |
|
114 | 114 | |
115 | - return $isMember; |
|
116 | - } |
|
115 | + return $isMember; |
|
116 | + } |
|
117 | 117 | } |
@@ -33,7 +33,7 @@ |
||
33 | 33 | } |
34 | 34 | if ($table !== null) { |
35 | 35 | $suffix = '_SEQ'; |
36 | - $table = '"' . $table . $suffix . '"'; |
|
36 | + $table = '"'.$table.$suffix.'"'; |
|
37 | 37 | } |
38 | 38 | return $this->conn->realLastInsertId($table); |
39 | 39 | } |
@@ -26,24 +26,24 @@ |
||
26 | 26 | namespace OC\DB; |
27 | 27 | |
28 | 28 | class AdapterOCI8 extends Adapter { |
29 | - public function lastInsertId($table) { |
|
30 | - if (is_null($table)) { |
|
31 | - throw new \InvalidArgumentException('Oracle requires a table name to be passed into lastInsertId()'); |
|
32 | - } |
|
33 | - if ($table !== null) { |
|
34 | - $suffix = '_SEQ'; |
|
35 | - $table = '"' . $table . $suffix . '"'; |
|
36 | - } |
|
37 | - return $this->conn->realLastInsertId($table); |
|
38 | - } |
|
29 | + public function lastInsertId($table) { |
|
30 | + if (is_null($table)) { |
|
31 | + throw new \InvalidArgumentException('Oracle requires a table name to be passed into lastInsertId()'); |
|
32 | + } |
|
33 | + if ($table !== null) { |
|
34 | + $suffix = '_SEQ'; |
|
35 | + $table = '"' . $table . $suffix . '"'; |
|
36 | + } |
|
37 | + return $this->conn->realLastInsertId($table); |
|
38 | + } |
|
39 | 39 | |
40 | - public const UNIX_TIMESTAMP_REPLACEMENT = "(cast(sys_extract_utc(systimestamp) as date) - date'1970-01-01') * 86400"; |
|
40 | + public const UNIX_TIMESTAMP_REPLACEMENT = "(cast(sys_extract_utc(systimestamp) as date) - date'1970-01-01') * 86400"; |
|
41 | 41 | |
42 | - public function fixupStatement($statement) { |
|
43 | - $statement = preg_replace('/`(\w+)` ILIKE \?/', 'REGEXP_LIKE(`$1`, \'^\' || REPLACE(?, \'%\', \'.*\') || \'$\', \'i\')', $statement); |
|
44 | - $statement = str_replace('`', '"', $statement); |
|
45 | - $statement = str_ireplace('NOW()', 'CURRENT_TIMESTAMP', $statement); |
|
46 | - $statement = str_ireplace('UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement); |
|
47 | - return $statement; |
|
48 | - } |
|
42 | + public function fixupStatement($statement) { |
|
43 | + $statement = preg_replace('/`(\w+)` ILIKE \?/', 'REGEXP_LIKE(`$1`, \'^\' || REPLACE(?, \'%\', \'.*\') || \'$\', \'i\')', $statement); |
|
44 | + $statement = str_replace('`', '"', $statement); |
|
45 | + $statement = str_ireplace('NOW()', 'CURRENT_TIMESTAMP', $statement); |
|
46 | + $statement = str_ireplace('UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement); |
|
47 | + return $statement; |
|
48 | + } |
|
49 | 49 | } |
@@ -25,17 +25,17 @@ |
||
25 | 25 | use OCP\DB\QueryBuilder\IQueryFunction; |
26 | 26 | |
27 | 27 | class QueryFunction implements IQueryFunction { |
28 | - /** @var string */ |
|
29 | - protected $function; |
|
28 | + /** @var string */ |
|
29 | + protected $function; |
|
30 | 30 | |
31 | - public function __construct($function) { |
|
32 | - $this->function = $function; |
|
33 | - } |
|
31 | + public function __construct($function) { |
|
32 | + $this->function = $function; |
|
33 | + } |
|
34 | 34 | |
35 | - /** |
|
36 | - * @return string |
|
37 | - */ |
|
38 | - public function __toString() { |
|
39 | - return (string) $this->function; |
|
40 | - } |
|
35 | + /** |
|
36 | + * @return string |
|
37 | + */ |
|
38 | + public function __toString() { |
|
39 | + return (string) $this->function; |
|
40 | + } |
|
41 | 41 | } |
@@ -25,17 +25,17 @@ |
||
25 | 25 | use OCP\DB\QueryBuilder\IParameter; |
26 | 26 | |
27 | 27 | class Parameter implements IParameter { |
28 | - /** @var mixed */ |
|
29 | - protected $name; |
|
28 | + /** @var mixed */ |
|
29 | + protected $name; |
|
30 | 30 | |
31 | - public function __construct($name) { |
|
32 | - $this->name = $name; |
|
33 | - } |
|
31 | + public function __construct($name) { |
|
32 | + $this->name = $name; |
|
33 | + } |
|
34 | 34 | |
35 | - /** |
|
36 | - * @return string |
|
37 | - */ |
|
38 | - public function __toString() { |
|
39 | - return (string) $this->name; |
|
40 | - } |
|
35 | + /** |
|
36 | + * @return string |
|
37 | + */ |
|
38 | + public function __toString() { |
|
39 | + return (string) $this->name; |
|
40 | + } |
|
41 | 41 | } |
@@ -25,32 +25,32 @@ |
||
25 | 25 | use Doctrine\DBAL\Schema\Schema; |
26 | 26 | |
27 | 27 | class PostgreSqlMigrator extends Migrator { |
28 | - /** |
|
29 | - * @param Schema $targetSchema |
|
30 | - * @param \Doctrine\DBAL\Connection $connection |
|
31 | - * @return \Doctrine\DBAL\Schema\SchemaDiff |
|
32 | - */ |
|
33 | - protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) { |
|
34 | - $schemaDiff = parent::getDiff($targetSchema, $connection); |
|
28 | + /** |
|
29 | + * @param Schema $targetSchema |
|
30 | + * @param \Doctrine\DBAL\Connection $connection |
|
31 | + * @return \Doctrine\DBAL\Schema\SchemaDiff |
|
32 | + */ |
|
33 | + protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) { |
|
34 | + $schemaDiff = parent::getDiff($targetSchema, $connection); |
|
35 | 35 | |
36 | - foreach ($schemaDiff->changedTables as $tableDiff) { |
|
37 | - // fix default value in brackets - pg 9.4 is returning a negative default value in () |
|
38 | - // see https://github.com/doctrine/dbal/issues/2427 |
|
39 | - foreach ($tableDiff->changedColumns as $column) { |
|
40 | - $column->changedProperties = array_filter($column->changedProperties, function ($changedProperties) use ($column) { |
|
41 | - if ($changedProperties !== 'default') { |
|
42 | - return true; |
|
43 | - } |
|
44 | - $fromDefault = $column->fromColumn->getDefault(); |
|
45 | - $toDefault = $column->column->getDefault(); |
|
46 | - $fromDefault = trim($fromDefault, "()"); |
|
36 | + foreach ($schemaDiff->changedTables as $tableDiff) { |
|
37 | + // fix default value in brackets - pg 9.4 is returning a negative default value in () |
|
38 | + // see https://github.com/doctrine/dbal/issues/2427 |
|
39 | + foreach ($tableDiff->changedColumns as $column) { |
|
40 | + $column->changedProperties = array_filter($column->changedProperties, function ($changedProperties) use ($column) { |
|
41 | + if ($changedProperties !== 'default') { |
|
42 | + return true; |
|
43 | + } |
|
44 | + $fromDefault = $column->fromColumn->getDefault(); |
|
45 | + $toDefault = $column->column->getDefault(); |
|
46 | + $fromDefault = trim($fromDefault, "()"); |
|
47 | 47 | |
48 | - // by intention usage of != |
|
49 | - return $fromDefault != $toDefault; |
|
50 | - }); |
|
51 | - } |
|
52 | - } |
|
48 | + // by intention usage of != |
|
49 | + return $fromDefault != $toDefault; |
|
50 | + }); |
|
51 | + } |
|
52 | + } |
|
53 | 53 | |
54 | - return $schemaDiff; |
|
55 | - } |
|
54 | + return $schemaDiff; |
|
55 | + } |
|
56 | 56 | } |
@@ -37,7 +37,7 @@ |
||
37 | 37 | // fix default value in brackets - pg 9.4 is returning a negative default value in () |
38 | 38 | // see https://github.com/doctrine/dbal/issues/2427 |
39 | 39 | foreach ($tableDiff->changedColumns as $column) { |
40 | - $column->changedProperties = array_filter($column->changedProperties, function ($changedProperties) use ($column) { |
|
40 | + $column->changedProperties = array_filter($column->changedProperties, function($changedProperties) use ($column) { |
|
41 | 41 | if ($changedProperties !== 'default') { |
42 | 42 | return true; |
43 | 43 | } |
@@ -22,31 +22,31 @@ |
||
22 | 22 | namespace OC\App\AppStore\Version; |
23 | 23 | |
24 | 24 | class Version { |
25 | - /** @var string */ |
|
26 | - private $minVersion; |
|
27 | - /** @var string */ |
|
28 | - private $maxVersion; |
|
25 | + /** @var string */ |
|
26 | + private $minVersion; |
|
27 | + /** @var string */ |
|
28 | + private $maxVersion; |
|
29 | 29 | |
30 | - /** |
|
31 | - * @param string $minVersion |
|
32 | - * @param string $maxVersion |
|
33 | - */ |
|
34 | - public function __construct($minVersion, $maxVersion) { |
|
35 | - $this->minVersion = $minVersion; |
|
36 | - $this->maxVersion = $maxVersion; |
|
37 | - } |
|
30 | + /** |
|
31 | + * @param string $minVersion |
|
32 | + * @param string $maxVersion |
|
33 | + */ |
|
34 | + public function __construct($minVersion, $maxVersion) { |
|
35 | + $this->minVersion = $minVersion; |
|
36 | + $this->maxVersion = $maxVersion; |
|
37 | + } |
|
38 | 38 | |
39 | - /** |
|
40 | - * @return string |
|
41 | - */ |
|
42 | - public function getMinimumVersion() { |
|
43 | - return $this->minVersion; |
|
44 | - } |
|
39 | + /** |
|
40 | + * @return string |
|
41 | + */ |
|
42 | + public function getMinimumVersion() { |
|
43 | + return $this->minVersion; |
|
44 | + } |
|
45 | 45 | |
46 | - /** |
|
47 | - * @return string |
|
48 | - */ |
|
49 | - public function getMaximumVersion() { |
|
50 | - return $this->maxVersion; |
|
51 | - } |
|
46 | + /** |
|
47 | + * @return string |
|
48 | + */ |
|
49 | + public function getMaximumVersion() { |
|
50 | + return $this->maxVersion; |
|
51 | + } |
|
52 | 52 | } |
@@ -90,8 +90,8 @@ discard block |
||
90 | 90 | break; |
91 | 91 | |
92 | 92 | case 'openssl': |
93 | - $prettyVersion = preg_replace_callback('{^(?:OpenSSL\s*)?([0-9.]+)([a-z]?).*}', function ($match) { |
|
94 | - return $match[1] . (empty($match[2]) ? '' : '.' . (ord($match[2]) - 96)); |
|
93 | + $prettyVersion = preg_replace_callback('{^(?:OpenSSL\s*)?([0-9.]+)([a-z]?).*}', function($match) { |
|
94 | + return $match[1].(empty($match[2]) ? '' : '.'.(ord($match[2]) - 96)); |
|
95 | 95 | }, OPENSSL_VERSION_TEXT); |
96 | 96 | break; |
97 | 97 | |
@@ -166,19 +166,19 @@ discard block |
||
166 | 166 | return '9999999-dev'; |
167 | 167 | } |
168 | 168 | if ('dev-' === strtolower(substr($version, 0, 4))) { |
169 | - return 'dev-' . substr($version, 4); |
|
169 | + return 'dev-'.substr($version, 4); |
|
170 | 170 | } |
171 | 171 | // match classical versioning |
172 | - if (preg_match('{^v?(\d{1,3})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) { |
|
172 | + if (preg_match('{^v?(\d{1,3})(\.\d+)?(\.\d+)?(\.\d+)?'.self::$modifierRegex.'$}i', $version, $matches)) { |
|
173 | 173 | $version = $matches[1] |
174 | 174 | . (!empty($matches[2]) ? $matches[2] : '.0') |
175 | 175 | . (!empty($matches[3]) ? $matches[3] : '.0') |
176 | 176 | . (!empty($matches[4]) ? $matches[4] : '.0'); |
177 | 177 | $index = 5; |
178 | - } elseif (preg_match('{^v?(\d{4}(?:[.:-]?\d{2}){1,6}(?:[.:-]?\d{1,3})?)' . self::$modifierRegex . '$}i', $version, $matches)) { // match date-based versioning |
|
178 | + } elseif (preg_match('{^v?(\d{4}(?:[.:-]?\d{2}){1,6}(?:[.:-]?\d{1,3})?)'.self::$modifierRegex.'$}i', $version, $matches)) { // match date-based versioning |
|
179 | 179 | $version = preg_replace('{\D}', '-', $matches[1]); |
180 | 180 | $index = 2; |
181 | - } elseif (preg_match('{^v?(\d{4,})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) { |
|
181 | + } elseif (preg_match('{^v?(\d{4,})(\.\d+)?(\.\d+)?(\.\d+)?'.self::$modifierRegex.'$}i', $version, $matches)) { |
|
182 | 182 | $version = $matches[1] |
183 | 183 | . (!empty($matches[2]) ? $matches[2] : '.0') |
184 | 184 | . (!empty($matches[3]) ? $matches[3] : '.0') |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | if ('stable' === $matches[$index]) { |
192 | 192 | return $version; |
193 | 193 | } |
194 | - $version .= '-' . $this->expandStability($matches[$index]) . (!empty($matches[$index + 1]) ? $matches[$index + 1] : ''); |
|
194 | + $version .= '-'.$this->expandStability($matches[$index]).(!empty($matches[$index + 1]) ? $matches[$index + 1] : ''); |
|
195 | 195 | } |
196 | 196 | if (!empty($matches[$index + 2])) { |
197 | 197 | $version .= '-dev'; |
@@ -199,12 +199,12 @@ discard block |
||
199 | 199 | return $version; |
200 | 200 | } |
201 | 201 | $extraMessage = ''; |
202 | - if (preg_match('{ +as +' . preg_quote($version) . '$}', $fullVersion)) { |
|
203 | - $extraMessage = ' in "' . $fullVersion . '", the alias must be an exact version'; |
|
204 | - } elseif (preg_match('{^' . preg_quote($version) . ' +as +}', $fullVersion)) { |
|
205 | - $extraMessage = ' in "' . $fullVersion . '", the alias source must be an exact version, if it is a branch name you should prefix it with dev-'; |
|
202 | + if (preg_match('{ +as +'.preg_quote($version).'$}', $fullVersion)) { |
|
203 | + $extraMessage = ' in "'.$fullVersion.'", the alias must be an exact version'; |
|
204 | + } elseif (preg_match('{^'.preg_quote($version).' +as +}', $fullVersion)) { |
|
205 | + $extraMessage = ' in "'.$fullVersion.'", the alias source must be an exact version, if it is a branch name you should prefix it with dev-'; |
|
206 | 206 | } |
207 | - throw new \UnexpectedValueException('Invalid version string "' . $version . '"' . $extraMessage); |
|
207 | + throw new \UnexpectedValueException('Invalid version string "'.$version.'"'.$extraMessage); |
|
208 | 208 | } |
209 | 209 | |
210 | 210 | /** |
@@ -31,196 +31,196 @@ |
||
31 | 31 | * @package OC\App |
32 | 32 | */ |
33 | 33 | class PlatformRepository { |
34 | - public function __construct() { |
|
35 | - $this->packages = $this->initialize(); |
|
36 | - } |
|
37 | - |
|
38 | - protected function initialize() { |
|
39 | - $loadedExtensions = get_loaded_extensions(); |
|
40 | - $packages = []; |
|
41 | - |
|
42 | - // Extensions scanning |
|
43 | - foreach ($loadedExtensions as $name) { |
|
44 | - if (in_array($name, ['standard', 'Core'])) { |
|
45 | - continue; |
|
46 | - } |
|
47 | - |
|
48 | - $ext = new \ReflectionExtension($name); |
|
49 | - try { |
|
50 | - $prettyVersion = $ext->getVersion(); |
|
51 | - $prettyVersion = $this->normalizeVersion($prettyVersion); |
|
52 | - } catch (\UnexpectedValueException $e) { |
|
53 | - $prettyVersion = '0'; |
|
54 | - $prettyVersion = $this->normalizeVersion($prettyVersion); |
|
55 | - } |
|
56 | - |
|
57 | - $packages[$this->buildPackageName($name)] = $prettyVersion; |
|
58 | - } |
|
59 | - |
|
60 | - foreach ($loadedExtensions as $name) { |
|
61 | - $prettyVersion = null; |
|
62 | - switch ($name) { |
|
63 | - case 'curl': |
|
64 | - $curlVersion = curl_version(); |
|
65 | - $prettyVersion = $curlVersion['version']; |
|
66 | - break; |
|
67 | - |
|
68 | - case 'intl': |
|
69 | - $name = 'ICU'; |
|
70 | - if (defined('INTL_ICU_VERSION')) { |
|
71 | - $prettyVersion = INTL_ICU_VERSION; |
|
72 | - } else { |
|
73 | - $reflector = new \ReflectionExtension('intl'); |
|
74 | - |
|
75 | - ob_start(); |
|
76 | - $reflector->info(); |
|
77 | - $output = ob_get_clean(); |
|
78 | - |
|
79 | - preg_match('/^ICU version => (.*)$/m', $output, $matches); |
|
80 | - $prettyVersion = $matches[1]; |
|
81 | - } |
|
82 | - |
|
83 | - break; |
|
84 | - |
|
85 | - case 'libxml': |
|
86 | - $prettyVersion = LIBXML_DOTTED_VERSION; |
|
87 | - break; |
|
88 | - |
|
89 | - case 'openssl': |
|
90 | - $prettyVersion = preg_replace_callback('{^(?:OpenSSL\s*)?([0-9.]+)([a-z]?).*}', function ($match) { |
|
91 | - return $match[1] . (empty($match[2]) ? '' : '.' . (ord($match[2]) - 96)); |
|
92 | - }, OPENSSL_VERSION_TEXT); |
|
93 | - break; |
|
94 | - |
|
95 | - case 'pcre': |
|
96 | - $prettyVersion = preg_replace('{^(\S+).*}', '$1', PCRE_VERSION); |
|
97 | - break; |
|
98 | - |
|
99 | - case 'uuid': |
|
100 | - $prettyVersion = phpversion('uuid'); |
|
101 | - break; |
|
102 | - |
|
103 | - case 'xsl': |
|
104 | - $prettyVersion = LIBXSLT_DOTTED_VERSION; |
|
105 | - break; |
|
106 | - |
|
107 | - default: |
|
108 | - // None handled extensions have no special cases, skip |
|
109 | - continue 2; |
|
110 | - } |
|
111 | - |
|
112 | - try { |
|
113 | - $prettyVersion = $this->normalizeVersion($prettyVersion); |
|
114 | - } catch (\UnexpectedValueException $e) { |
|
115 | - continue; |
|
116 | - } |
|
117 | - |
|
118 | - $packages[$this->buildPackageName($name)] = $prettyVersion; |
|
119 | - } |
|
120 | - |
|
121 | - return $packages; |
|
122 | - } |
|
123 | - |
|
124 | - private function buildPackageName($name) { |
|
125 | - return str_replace(' ', '-', $name); |
|
126 | - } |
|
127 | - |
|
128 | - /** |
|
129 | - * @param $name |
|
130 | - * @return string |
|
131 | - */ |
|
132 | - public function findLibrary($name) { |
|
133 | - $extName = $this->buildPackageName($name); |
|
134 | - if (isset($this->packages[$extName])) { |
|
135 | - return $this->packages[$extName]; |
|
136 | - } |
|
137 | - return null; |
|
138 | - } |
|
139 | - |
|
140 | - private static $modifierRegex = '[._-]?(?:(stable|beta|b|RC|alpha|a|patch|pl|p)(?:[.-]?(\d+))?)?([.-]?dev)?'; |
|
141 | - |
|
142 | - /** |
|
143 | - * Normalizes a version string to be able to perform comparisons on it |
|
144 | - * |
|
145 | - * https://github.com/composer/composer/blob/master/src/Composer/Package/Version/VersionParser.php#L94 |
|
146 | - * |
|
147 | - * @param string $version |
|
148 | - * @param string $fullVersion optional complete version string to give more context |
|
149 | - * @throws \UnexpectedValueException |
|
150 | - * @return string |
|
151 | - */ |
|
152 | - public function normalizeVersion($version, $fullVersion = null) { |
|
153 | - $version = trim($version); |
|
154 | - if (null === $fullVersion) { |
|
155 | - $fullVersion = $version; |
|
156 | - } |
|
157 | - // ignore aliases and just assume the alias is required instead of the source |
|
158 | - if (preg_match('{^([^,\s]+) +as +([^,\s]+)$}', $version, $match)) { |
|
159 | - $version = $match[1]; |
|
160 | - } |
|
161 | - // match master-like branches |
|
162 | - if (preg_match('{^(?:dev-)?(?:master|trunk|default)$}i', $version)) { |
|
163 | - return '9999999-dev'; |
|
164 | - } |
|
165 | - if ('dev-' === strtolower(substr($version, 0, 4))) { |
|
166 | - return 'dev-' . substr($version, 4); |
|
167 | - } |
|
168 | - // match classical versioning |
|
169 | - if (preg_match('{^v?(\d{1,3})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) { |
|
170 | - $version = $matches[1] |
|
171 | - . (!empty($matches[2]) ? $matches[2] : '.0') |
|
172 | - . (!empty($matches[3]) ? $matches[3] : '.0') |
|
173 | - . (!empty($matches[4]) ? $matches[4] : '.0'); |
|
174 | - $index = 5; |
|
175 | - } elseif (preg_match('{^v?(\d{4}(?:[.:-]?\d{2}){1,6}(?:[.:-]?\d{1,3})?)' . self::$modifierRegex . '$}i', $version, $matches)) { // match date-based versioning |
|
176 | - $version = preg_replace('{\D}', '-', $matches[1]); |
|
177 | - $index = 2; |
|
178 | - } elseif (preg_match('{^v?(\d{4,})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) { |
|
179 | - $version = $matches[1] |
|
180 | - . (!empty($matches[2]) ? $matches[2] : '.0') |
|
181 | - . (!empty($matches[3]) ? $matches[3] : '.0') |
|
182 | - . (!empty($matches[4]) ? $matches[4] : '.0'); |
|
183 | - $index = 5; |
|
184 | - } |
|
185 | - // add version modifiers if a version was matched |
|
186 | - if (isset($index)) { |
|
187 | - if (!empty($matches[$index])) { |
|
188 | - if ('stable' === $matches[$index]) { |
|
189 | - return $version; |
|
190 | - } |
|
191 | - $version .= '-' . $this->expandStability($matches[$index]) . (!empty($matches[$index + 1]) ? $matches[$index + 1] : ''); |
|
192 | - } |
|
193 | - if (!empty($matches[$index + 2])) { |
|
194 | - $version .= '-dev'; |
|
195 | - } |
|
196 | - return $version; |
|
197 | - } |
|
198 | - $extraMessage = ''; |
|
199 | - if (preg_match('{ +as +' . preg_quote($version) . '$}', $fullVersion)) { |
|
200 | - $extraMessage = ' in "' . $fullVersion . '", the alias must be an exact version'; |
|
201 | - } elseif (preg_match('{^' . preg_quote($version) . ' +as +}', $fullVersion)) { |
|
202 | - $extraMessage = ' in "' . $fullVersion . '", the alias source must be an exact version, if it is a branch name you should prefix it with dev-'; |
|
203 | - } |
|
204 | - throw new \UnexpectedValueException('Invalid version string "' . $version . '"' . $extraMessage); |
|
205 | - } |
|
206 | - |
|
207 | - /** |
|
208 | - * @param string $stability |
|
209 | - */ |
|
210 | - private function expandStability($stability) { |
|
211 | - $stability = strtolower($stability); |
|
212 | - switch ($stability) { |
|
213 | - case 'a': |
|
214 | - return 'alpha'; |
|
215 | - case 'b': |
|
216 | - return 'beta'; |
|
217 | - case 'p': |
|
218 | - case 'pl': |
|
219 | - return 'patch'; |
|
220 | - case 'rc': |
|
221 | - return 'RC'; |
|
222 | - default: |
|
223 | - return $stability; |
|
224 | - } |
|
225 | - } |
|
34 | + public function __construct() { |
|
35 | + $this->packages = $this->initialize(); |
|
36 | + } |
|
37 | + |
|
38 | + protected function initialize() { |
|
39 | + $loadedExtensions = get_loaded_extensions(); |
|
40 | + $packages = []; |
|
41 | + |
|
42 | + // Extensions scanning |
|
43 | + foreach ($loadedExtensions as $name) { |
|
44 | + if (in_array($name, ['standard', 'Core'])) { |
|
45 | + continue; |
|
46 | + } |
|
47 | + |
|
48 | + $ext = new \ReflectionExtension($name); |
|
49 | + try { |
|
50 | + $prettyVersion = $ext->getVersion(); |
|
51 | + $prettyVersion = $this->normalizeVersion($prettyVersion); |
|
52 | + } catch (\UnexpectedValueException $e) { |
|
53 | + $prettyVersion = '0'; |
|
54 | + $prettyVersion = $this->normalizeVersion($prettyVersion); |
|
55 | + } |
|
56 | + |
|
57 | + $packages[$this->buildPackageName($name)] = $prettyVersion; |
|
58 | + } |
|
59 | + |
|
60 | + foreach ($loadedExtensions as $name) { |
|
61 | + $prettyVersion = null; |
|
62 | + switch ($name) { |
|
63 | + case 'curl': |
|
64 | + $curlVersion = curl_version(); |
|
65 | + $prettyVersion = $curlVersion['version']; |
|
66 | + break; |
|
67 | + |
|
68 | + case 'intl': |
|
69 | + $name = 'ICU'; |
|
70 | + if (defined('INTL_ICU_VERSION')) { |
|
71 | + $prettyVersion = INTL_ICU_VERSION; |
|
72 | + } else { |
|
73 | + $reflector = new \ReflectionExtension('intl'); |
|
74 | + |
|
75 | + ob_start(); |
|
76 | + $reflector->info(); |
|
77 | + $output = ob_get_clean(); |
|
78 | + |
|
79 | + preg_match('/^ICU version => (.*)$/m', $output, $matches); |
|
80 | + $prettyVersion = $matches[1]; |
|
81 | + } |
|
82 | + |
|
83 | + break; |
|
84 | + |
|
85 | + case 'libxml': |
|
86 | + $prettyVersion = LIBXML_DOTTED_VERSION; |
|
87 | + break; |
|
88 | + |
|
89 | + case 'openssl': |
|
90 | + $prettyVersion = preg_replace_callback('{^(?:OpenSSL\s*)?([0-9.]+)([a-z]?).*}', function ($match) { |
|
91 | + return $match[1] . (empty($match[2]) ? '' : '.' . (ord($match[2]) - 96)); |
|
92 | + }, OPENSSL_VERSION_TEXT); |
|
93 | + break; |
|
94 | + |
|
95 | + case 'pcre': |
|
96 | + $prettyVersion = preg_replace('{^(\S+).*}', '$1', PCRE_VERSION); |
|
97 | + break; |
|
98 | + |
|
99 | + case 'uuid': |
|
100 | + $prettyVersion = phpversion('uuid'); |
|
101 | + break; |
|
102 | + |
|
103 | + case 'xsl': |
|
104 | + $prettyVersion = LIBXSLT_DOTTED_VERSION; |
|
105 | + break; |
|
106 | + |
|
107 | + default: |
|
108 | + // None handled extensions have no special cases, skip |
|
109 | + continue 2; |
|
110 | + } |
|
111 | + |
|
112 | + try { |
|
113 | + $prettyVersion = $this->normalizeVersion($prettyVersion); |
|
114 | + } catch (\UnexpectedValueException $e) { |
|
115 | + continue; |
|
116 | + } |
|
117 | + |
|
118 | + $packages[$this->buildPackageName($name)] = $prettyVersion; |
|
119 | + } |
|
120 | + |
|
121 | + return $packages; |
|
122 | + } |
|
123 | + |
|
124 | + private function buildPackageName($name) { |
|
125 | + return str_replace(' ', '-', $name); |
|
126 | + } |
|
127 | + |
|
128 | + /** |
|
129 | + * @param $name |
|
130 | + * @return string |
|
131 | + */ |
|
132 | + public function findLibrary($name) { |
|
133 | + $extName = $this->buildPackageName($name); |
|
134 | + if (isset($this->packages[$extName])) { |
|
135 | + return $this->packages[$extName]; |
|
136 | + } |
|
137 | + return null; |
|
138 | + } |
|
139 | + |
|
140 | + private static $modifierRegex = '[._-]?(?:(stable|beta|b|RC|alpha|a|patch|pl|p)(?:[.-]?(\d+))?)?([.-]?dev)?'; |
|
141 | + |
|
142 | + /** |
|
143 | + * Normalizes a version string to be able to perform comparisons on it |
|
144 | + * |
|
145 | + * https://github.com/composer/composer/blob/master/src/Composer/Package/Version/VersionParser.php#L94 |
|
146 | + * |
|
147 | + * @param string $version |
|
148 | + * @param string $fullVersion optional complete version string to give more context |
|
149 | + * @throws \UnexpectedValueException |
|
150 | + * @return string |
|
151 | + */ |
|
152 | + public function normalizeVersion($version, $fullVersion = null) { |
|
153 | + $version = trim($version); |
|
154 | + if (null === $fullVersion) { |
|
155 | + $fullVersion = $version; |
|
156 | + } |
|
157 | + // ignore aliases and just assume the alias is required instead of the source |
|
158 | + if (preg_match('{^([^,\s]+) +as +([^,\s]+)$}', $version, $match)) { |
|
159 | + $version = $match[1]; |
|
160 | + } |
|
161 | + // match master-like branches |
|
162 | + if (preg_match('{^(?:dev-)?(?:master|trunk|default)$}i', $version)) { |
|
163 | + return '9999999-dev'; |
|
164 | + } |
|
165 | + if ('dev-' === strtolower(substr($version, 0, 4))) { |
|
166 | + return 'dev-' . substr($version, 4); |
|
167 | + } |
|
168 | + // match classical versioning |
|
169 | + if (preg_match('{^v?(\d{1,3})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) { |
|
170 | + $version = $matches[1] |
|
171 | + . (!empty($matches[2]) ? $matches[2] : '.0') |
|
172 | + . (!empty($matches[3]) ? $matches[3] : '.0') |
|
173 | + . (!empty($matches[4]) ? $matches[4] : '.0'); |
|
174 | + $index = 5; |
|
175 | + } elseif (preg_match('{^v?(\d{4}(?:[.:-]?\d{2}){1,6}(?:[.:-]?\d{1,3})?)' . self::$modifierRegex . '$}i', $version, $matches)) { // match date-based versioning |
|
176 | + $version = preg_replace('{\D}', '-', $matches[1]); |
|
177 | + $index = 2; |
|
178 | + } elseif (preg_match('{^v?(\d{4,})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) { |
|
179 | + $version = $matches[1] |
|
180 | + . (!empty($matches[2]) ? $matches[2] : '.0') |
|
181 | + . (!empty($matches[3]) ? $matches[3] : '.0') |
|
182 | + . (!empty($matches[4]) ? $matches[4] : '.0'); |
|
183 | + $index = 5; |
|
184 | + } |
|
185 | + // add version modifiers if a version was matched |
|
186 | + if (isset($index)) { |
|
187 | + if (!empty($matches[$index])) { |
|
188 | + if ('stable' === $matches[$index]) { |
|
189 | + return $version; |
|
190 | + } |
|
191 | + $version .= '-' . $this->expandStability($matches[$index]) . (!empty($matches[$index + 1]) ? $matches[$index + 1] : ''); |
|
192 | + } |
|
193 | + if (!empty($matches[$index + 2])) { |
|
194 | + $version .= '-dev'; |
|
195 | + } |
|
196 | + return $version; |
|
197 | + } |
|
198 | + $extraMessage = ''; |
|
199 | + if (preg_match('{ +as +' . preg_quote($version) . '$}', $fullVersion)) { |
|
200 | + $extraMessage = ' in "' . $fullVersion . '", the alias must be an exact version'; |
|
201 | + } elseif (preg_match('{^' . preg_quote($version) . ' +as +}', $fullVersion)) { |
|
202 | + $extraMessage = ' in "' . $fullVersion . '", the alias source must be an exact version, if it is a branch name you should prefix it with dev-'; |
|
203 | + } |
|
204 | + throw new \UnexpectedValueException('Invalid version string "' . $version . '"' . $extraMessage); |
|
205 | + } |
|
206 | + |
|
207 | + /** |
|
208 | + * @param string $stability |
|
209 | + */ |
|
210 | + private function expandStability($stability) { |
|
211 | + $stability = strtolower($stability); |
|
212 | + switch ($stability) { |
|
213 | + case 'a': |
|
214 | + return 'alpha'; |
|
215 | + case 'b': |
|
216 | + return 'beta'; |
|
217 | + case 'p': |
|
218 | + case 'pl': |
|
219 | + return 'patch'; |
|
220 | + case 'rc': |
|
221 | + return 'RC'; |
|
222 | + default: |
|
223 | + return $stability; |
|
224 | + } |
|
225 | + } |
|
226 | 226 | } |