Skip to content

Commit fac7561

Browse files
committed
chore: remove phpscoper for now
Signed-off-by: Benjamin Frueh <benjamin.frueh@gmail.com>
1 parent 6534318 commit fac7561

8 files changed

Lines changed: 65 additions & 1884 deletions

File tree

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ build: node-modules build-js-production composer-install-no-dev
144144
--exclude="$(APP_NAME)/stylelint.config.cjs" \
145145
--exclude="$(APP_NAME)/tests" \
146146
--exclude="$(APP_NAME)/tsconfig.json" \
147-
--exclude="$(APP_NAME)/vendor/.scoped" \
148147
--exclude="$(APP_NAME)/vendor-bin" \
149148
--exclude="$(APP_NAME)/vite.*" \
150149
$(PROJECT_DIR) $(RELEASE_DIR)/

composer.json

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
"php": "^8.1",
1616
"ext-json": "*",
1717
"ext-pdo": "*",
18-
"bamarni/composer-bin-plugin": "^1.9",
1918
"league/commonmark": "^2.7",
2019
"patrickschur/language-detection": "^5.3",
2120
"symfony/string": "^6.0",
@@ -24,6 +23,7 @@
2423
},
2524
"require-dev": {
2625
"ext-dom": "*",
26+
"bamarni/composer-bin-plugin": "^1.9",
2727
"guzzlehttp/guzzle": "^7.8",
2828
"rector/rector": "^2.0.3"
2929
},
@@ -36,14 +36,10 @@
3636
"psalm:update-baseline": "psalm --threads=1 --update-baseline --set-baseline=tests/psalm-baseline.xml",
3737
"test:unit": "phpunit -c tests/phpunit.xml",
3838
"post-install-cmd": [
39-
"composer install --working-dir=vendor-bin/php-scoper --ansi --no-interaction",
40-
"test -f vendor/.scoped || (vendor-bin/php-scoper/vendor/bin/php-scoper add-prefix --prefix='OCA\\Collectives\\Vendor' --output-dir=\"/tmp/scoped-vendor\" --working-dir=\"./vendor/\" -f --config=\"../scoper.inc.php\" && cp -rf /tmp/scoped-vendor/* ./vendor/ && rm -rf /tmp/scoped-vendor && touch vendor/.scoped)",
41-
"composer dump-autoload"
39+
"[ $COMPOSER_DEV_MODE -eq 0 ] || composer bin all install --ansi"
4240
],
4341
"post-update-cmd": [
44-
"composer install --working-dir=vendor-bin/php-scoper --ansi --no-interaction",
45-
"test -f vendor/.scoped || (vendor-bin/php-scoper/vendor/bin/php-scoper add-prefix --prefix='OCA\\Collectives\\Vendor' --output-dir=\"/tmp/scoped-vendor\" --working-dir=\"./vendor/\" -f --config=\"../scoper.inc.php\" && cp -rf /tmp/scoped-vendor/* ./vendor/ && rm -rf /tmp/scoped-vendor && touch vendor/.scoped)",
46-
"composer dump-autoload"
42+
"[ $COMPOSER_DEV_MODE -eq 0 ] || composer bin all install --ansi"
4743
]
4844
},
4945
"extra": {

composer.lock

Lines changed: 58 additions & 58 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/Search/FileSearch/LanguageDetector/LanguageDetector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
namespace OCA\Collectives\Search\FileSearch\LanguageDetector;
1111

12-
use OCA\Collectives\Vendor\LanguageDetection\Language;
12+
use LanguageDetection\Language;
1313

1414
class LanguageDetector {
1515
public function detect(string $text): ?string {

lib/Search/FileSearch/Stemmer/Stemmer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
namespace OCA\Collectives\Search\FileSearch\Stemmer;
1111

12-
use OCA\Collectives\Vendor\Wamania\Snowball\NotFoundException;
13-
use OCA\Collectives\Vendor\Wamania\Snowball\Stemmer\Stemmer as WamaniaStemmer;
14-
use OCA\Collectives\Vendor\Wamania\Snowball\StemmerFactory;
12+
use Wamania\Snowball\NotFoundException;
13+
use Wamania\Snowball\Stemmer\Stemmer as WamaniaStemmer;
14+
use Wamania\Snowball\StemmerFactory;
1515
use OCP\IConfig;
1616

1717
class Stemmer {

scoper.inc.php

Lines changed: 0 additions & 36 deletions
This file was deleted.

vendor-bin/php-scoper/composer.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)