Skip to content

Commit

Permalink
Merge pull request #1280 from nextcloud/remove-ds
Browse files Browse the repository at this point in the history 
chore: drop dependency php-ds
  • Loading branch information
@nickvergessen
nickvergessen committed Jan 18, 2023
2 parents 5e0dab1 + 72bdbe4 commit 299e51c
Show file tree
Hide file tree
Showing 24 changed files with 5 additions and 3,304 deletions.
1 change: 0 additions & 1 deletion composer.json
View file
Expand Up @@ -39,7 +39,6 @@
"opis/closure": "^3.6",
"pear/archive_tar": "^1.4.9",
"pear/pear-core-minimal": "^v1.10",
"php-ds/php-ds": "^1.3",
"php-http/guzzle7-adapter": "^1.0.0",
"php-opencloud/openstack": "^3.1",
"phpseclib/phpseclib": "^2.0.40",
Expand Down
53 changes: 1 addition & 52 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 0 additions & 15 deletions composer/autoload_classmap.php
View file
Expand Up @@ -1342,21 +1342,6 @@
'Doctrine\\DBAL\\VersionAwarePlatformDriver' => $vendorDir . '/doctrine/dbal/src/VersionAwarePlatformDriver.php',
'Doctrine\\Deprecations\\Deprecation' => $vendorDir . '/doctrine/deprecations/lib/Doctrine/Deprecations/Deprecation.php',
'Doctrine\\Deprecations\\PHPUnit\\VerifyDeprecations' => $vendorDir . '/doctrine/deprecations/lib/Doctrine/Deprecations/PHPUnit/VerifyDeprecations.php',
'Ds\\Collection' => $vendorDir . '/php-ds/php-ds/src/Collection.php',
'Ds\\Deque' => $vendorDir . '/php-ds/php-ds/src/Deque.php',
'Ds\\Hashable' => $vendorDir . '/php-ds/php-ds/src/Hashable.php',
'Ds\\Map' => $vendorDir . '/php-ds/php-ds/src/Map.php',
'Ds\\Pair' => $vendorDir . '/php-ds/php-ds/src/Pair.php',
'Ds\\PriorityQueue' => $vendorDir . '/php-ds/php-ds/src/PriorityQueue.php',
'Ds\\Queue' => $vendorDir . '/php-ds/php-ds/src/Queue.php',
'Ds\\Sequence' => $vendorDir . '/php-ds/php-ds/src/Sequence.php',
'Ds\\Set' => $vendorDir . '/php-ds/php-ds/src/Set.php',
'Ds\\Stack' => $vendorDir . '/php-ds/php-ds/src/Stack.php',
'Ds\\Traits\\Capacity' => $vendorDir . '/php-ds/php-ds/src/Traits/Capacity.php',
'Ds\\Traits\\GenericCollection' => $vendorDir . '/php-ds/php-ds/src/Traits/GenericCollection.php',
'Ds\\Traits\\GenericSequence' => $vendorDir . '/php-ds/php-ds/src/Traits/GenericSequence.php',
'Ds\\Traits\\SquaredCapacity' => $vendorDir . '/php-ds/php-ds/src/Traits/SquaredCapacity.php',
'Ds\\Vector' => $vendorDir . '/php-ds/php-ds/src/Vector.php',
'Egulias\\EmailValidator\\EmailLexer' => $vendorDir . '/egulias/email-validator/src/EmailLexer.php',
'Egulias\\EmailValidator\\EmailParser' => $vendorDir . '/egulias/email-validator/src/EmailParser.php',
'Egulias\\EmailValidator\\EmailValidator' => $vendorDir . '/egulias/email-validator/src/EmailValidator.php',
Expand Down
1 change: 0 additions & 1 deletion composer/autoload_psr4.php
View file
Expand Up @@ -81,7 +81,6 @@
'Fusonic\\OpenGraph\\' => array($vendorDir . '/fusonic/opengraph/src'),
'FG\\' => array($vendorDir . '/fgrosse/phpasn1/lib'),
'Egulias\\EmailValidator\\' => array($vendorDir . '/egulias/email-validator/src'),
'Ds\\' => array($vendorDir . '/php-ds/php-ds/src'),
'Doctrine\\Deprecations\\' => array($vendorDir . '/doctrine/deprecations/lib/Doctrine/Deprecations'),
'Doctrine\\DBAL\\' => array($vendorDir . '/doctrine/dbal/src'),
'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/lib/Doctrine/Common/Lexer'),
Expand Down
20 changes: 0 additions & 20 deletions composer/autoload_static.php
View file
Expand Up @@ -263,7 +263,6 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
),
'D' =>
array (
'Ds\\' => 3,
'Doctrine\\Deprecations\\' => 22,
'Doctrine\\DBAL\\' => 14,
'Doctrine\\Common\\Lexer\\' => 22,
Expand Down Expand Up @@ -592,10 +591,6 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
array (
0 => __DIR__ . '/..' . '/egulias/email-validator/src',
),
'Ds\\' =>
array (
0 => __DIR__ . '/..' . '/php-ds/php-ds/src',
),
'Doctrine\\Deprecations\\' =>
array (
0 => __DIR__ . '/..' . '/doctrine/deprecations/lib/Doctrine/Deprecations',
Expand Down Expand Up @@ -2014,21 +2009,6 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
'Doctrine\\DBAL\\VersionAwarePlatformDriver' => __DIR__ . '/..' . '/doctrine/dbal/src/VersionAwarePlatformDriver.php',
'Doctrine\\Deprecations\\Deprecation' => __DIR__ . '/..' . '/doctrine/deprecations/lib/Doctrine/Deprecations/Deprecation.php',
'Doctrine\\Deprecations\\PHPUnit\\VerifyDeprecations' => __DIR__ . '/..' . '/doctrine/deprecations/lib/Doctrine/Deprecations/PHPUnit/VerifyDeprecations.php',
'Ds\\Collection' => __DIR__ . '/..' . '/php-ds/php-ds/src/Collection.php',
'Ds\\Deque' => __DIR__ . '/..' . '/php-ds/php-ds/src/Deque.php',
'Ds\\Hashable' => __DIR__ . '/..' . '/php-ds/php-ds/src/Hashable.php',
'Ds\\Map' => __DIR__ . '/..' . '/php-ds/php-ds/src/Map.php',
'Ds\\Pair' => __DIR__ . '/..' . '/php-ds/php-ds/src/Pair.php',
'Ds\\PriorityQueue' => __DIR__ . '/..' . '/php-ds/php-ds/src/PriorityQueue.php',
'Ds\\Queue' => __DIR__ . '/..' . '/php-ds/php-ds/src/Queue.php',
'Ds\\Sequence' => __DIR__ . '/..' . '/php-ds/php-ds/src/Sequence.php',
'Ds\\Set' => __DIR__ . '/..' . '/php-ds/php-ds/src/Set.php',
'Ds\\Stack' => __DIR__ . '/..' . '/php-ds/php-ds/src/Stack.php',
'Ds\\Traits\\Capacity' => __DIR__ . '/..' . '/php-ds/php-ds/src/Traits/Capacity.php',
'Ds\\Traits\\GenericCollection' => __DIR__ . '/..' . '/php-ds/php-ds/src/Traits/GenericCollection.php',
'Ds\\Traits\\GenericSequence' => __DIR__ . '/..' . '/php-ds/php-ds/src/Traits/GenericSequence.php',
'Ds\\Traits\\SquaredCapacity' => __DIR__ . '/..' . '/php-ds/php-ds/src/Traits/SquaredCapacity.php',
'Ds\\Vector' => __DIR__ . '/..' . '/php-ds/php-ds/src/Vector.php',
'Egulias\\EmailValidator\\EmailLexer' => __DIR__ . '/..' . '/egulias/email-validator/src/EmailLexer.php',
'Egulias\\EmailValidator\\EmailParser' => __DIR__ . '/..' . '/egulias/email-validator/src/EmailParser.php',
'Egulias\\EmailValidator\\EmailValidator' => __DIR__ . '/..' . '/egulias/email-validator/src/EmailValidator.php',
Expand Down
56 changes: 1 addition & 55 deletions composer/installed.json
View file
Expand Up @@ -2889,60 +2889,6 @@
},
"install-path": "../pear/pear_exception"
},
{
"name": "php-ds/php-ds",
"version": "v1.3.0",
"version_normalized": "1.3.0.0",
"source": {
"type": "git",
"url": "https://github.com/php-ds/polyfill.git",
"reference": "b98396862fb8a13cbdbbaf4d18be28ee5c01ed3c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-ds/polyfill/zipball/b98396862fb8a13cbdbbaf4d18be28ee5c01ed3c",
"reference": "b98396862fb8a13cbdbbaf4d18be28ee5c01ed3c",
"shasum": ""
},
"require": {
"ext-json": "*",
"php": ">=7.0.0"
},
"provide": {
"ext-ds": "1.3.0"
},
"require-dev": {
"php-ds/tests": "^1.3"
},
"suggest": {
"ext-ds": "to improve performance and reduce memory usage"
},
"time": "2020-10-14T04:23:31+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
"psr-4": {
"Ds\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Rudi Theunissen",
"email": "rudolf.theunissen@gmail.com"
}
],
"keywords": [
"data structures",
"ds",
"php",
"polyfill"
],
"install-path": "../php-ds/php-ds"
},
{
"name": "php-http/guzzle7-adapter",
"version": "1.0.0",
Expand Down Expand Up @@ -6992,6 +6938,6 @@
"install-path": "../web-auth/webauthn-lib"
}
],
"dev": false,
"dev": true,
"dev-package-names": []
}
15 changes: 3 additions & 12 deletions composer/installed.php
View file
Expand Up @@ -3,11 +3,11 @@
'name' => 'nextcloud/3rdparty',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => 'e6a429dcd19e45c9c81528bf96a604f391519a85',
'reference' => '5e0dab110ac3bbf4d62ab0b808467b8d3350274e',
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
'dev' => false,
'dev' => true,
),
'versions' => array(
'aws/aws-crt-php' => array(
Expand Down Expand Up @@ -328,7 +328,7 @@
'nextcloud/3rdparty' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => 'e6a429dcd19e45c9c81528bf96a604f391519a85',
'reference' => '5e0dab110ac3bbf4d62ab0b808467b8d3350274e',
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
Expand Down Expand Up @@ -397,15 +397,6 @@
'aliases' => array(),
'dev_requirement' => false,
),
'php-ds/php-ds' => array(
'pretty_version' => 'v1.3.0',
'version' => '1.3.0.0',
'reference' => 'b98396862fb8a13cbdbbaf4d18be28ee5c01ed3c',
'type' => 'library',
'install_path' => __DIR__ . '/../php-ds/php-ds',
'aliases' => array(),
'dev_requirement' => false,
),
'php-http/async-client-implementation' => array(
'dev_requirement' => false,
'provided' => array(
Expand Down
21 changes: 0 additions & 21 deletions php-ds/php-ds/CONTRIBUTING.md
View file

This file was deleted.

20 changes: 0 additions & 20 deletions php-ds/php-ds/LICENSE
View file

This file was deleted.

52 changes: 0 additions & 52 deletions php-ds/php-ds/src/Collection.php
View file

This file was deleted.

26 changes: 0 additions & 26 deletions php-ds/php-ds/src/Deque.php
View file

This file was deleted.

0 comments on commit 299e51c

Please sign in to comment.