Skip to content

Commit 9d45470

Browse files
committed
Removed the AppStore feature
1 parent a63ae21 commit 9d45470

File tree

11 files changed

+7
-808
lines changed

11 files changed

+7
-808
lines changed

completion/bash/_phpbrew

+2-540
Large diffs are not rendered by default.

completion/zsh/_phpbrew

-37
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ local ret=1
6464
compile:'compile current source into Phar format library file.'
6565
archive:'Build executable phar file from composer.json'
6666
github:build-topics:'Build topic classes from the wiki of a GitHub Project.'
67-
app:'[deprecated] php app store'
6867
init:'Initialize phpbrew config file.'
6968
known:'List known PHP versions'
7069
install:'Install php'
@@ -171,42 +170,6 @@ local ret=1
171170
':repo' \
172171
&& ret=0
173172

174-
;;
175-
(app)
176-
_arguments -C \
177-
': :->cmds' \
178-
'*:: :->option-or-argument' \
179-
&& return
180-
case $state in
181-
(cmds)
182-
local commands; commands=(
183-
get:'[deprecated] Get PHP application'
184-
list:'[deprecated] List PHP applications'
185-
)
186-
_describe -t commands 'command' commands && ret=0
187-
;;
188-
(option-or-argument)
189-
curcontext=${curcontext%:*}-$line[1]:
190-
case $line[1] in
191-
(get)
192-
_arguments -w -S -s \
193-
'--chmod=[Set downloaded file mode]' \
194-
'--downloader=[Use alternative downloader.]' \
195-
'--continue[Continue getting a partially downloaded file.]' \
196-
'--http-proxy=[HTTP proxy address]' \
197-
'--http-proxy-auth=[HTTP proxy authentication]' \
198-
'--connect-timeout=[Connection timeout]' \
199-
':app-name:("composer" "phpunit" "phpmd" "behat-2.5" "behat-3.3" "sami" "phpcs" "phpcbf" "pdepend" "onion" "box-2.7" "psysh" "php-cs-fixer" "phpdoc" "phpcov" "phpcpd" "phpdcd" "phptok" "phploc")' \
200-
&& ret=0
201-
202-
;;
203-
(list)
204-
205-
;;
206-
esac
207-
;;
208-
esac
209-
210173
;;
211174
(init)
212175
_arguments -w -S -s \

phpunit.xml.dist

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<ini name="safe_mode_allowed_env_var" value="PHP_,PHPBREW"/>
1212
<env name="PHPBREW_ROOT" value=".phpbrew"/>
1313
<env name="PHPBREW_HOME" value=".phpbrew"/>
14-
<env name="PHPBREW_BIN" value=".phpbrew/bin"/>
1514
<env name="PHPBREW_EXTENSION_DIR" value="tests/fixtures/ext"/>
1615
<env name="PHPBREW_FIXTURES_PHP_DIR" value="tests/fixtures/php"/>
1716
<env name="PHPBREW_EXPECTED_PHP_DIR" value="tests/expected/php"/>

shell/bashrc

+2-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
# PHPBREW_SYSTEM_PHP: the path to the system php binary.
1414

1515
[[ -z "$PHPBREW_HOME" ]] && export PHPBREW_HOME="$HOME/.phpbrew"
16-
[[ -z "$PHPBREW_BIN" ]] && export PHPBREW_BIN="$PHPBREW_HOME/bin"
1716

1817
# The minimal PHP version that PhpBrew supports as interpreter
1918
MIN_PHP_VERSION="7.2.0"
@@ -120,9 +119,9 @@ function __phpbrew_set_path()
120119

121120
if [[ -z "$PHPBREW_PATH" ]]
122121
then
123-
export PATH=$PHPBREW_BIN:$PATH_WITHOUT_PHPBREW
122+
export PATH=$PATH_WITHOUT_PHPBREW
124123
else
125-
export PATH=$PHPBREW_PATH:$PHPBREW_BIN:$PATH_WITHOUT_PHPBREW
124+
export PATH=$PHPBREW_PATH:$PATH_WITHOUT_PHPBREW
126125
fi
127126
}
128127

@@ -141,7 +140,6 @@ fi
141140

142141
[[ -e "$PHPBREW_ROOT" ]] || mkdir $PHPBREW_ROOT
143142
[[ -e "$PHPBREW_HOME" ]] || mkdir $PHPBREW_HOME
144-
[[ -e "$PHPBREW_BIN" ]] || mkdir -p $PHPBREW_BIN
145143

146144
# When setting lookup prefix, the alias name will be translated into the real
147145
# path.

shell/phpbrew.fish

+2-19
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ function __phpbrew_set_path
4848
end
4949

5050
if set -q PHPBREW_PATH
51-
set -gx PATH $PHPBREW_PATH $PHPBREW_BIN $PATH_WITHOUT_PHPBREW
51+
set -gx PATH $PHPBREW_PATH $PATH_WITHOUT_PHPBREW
5252
else
53-
set -gx PATH $PHPBREW_BIN $PATH_WITHOUT_PHPBREW
53+
set -gx PATH $PATH_WITHOUT_PHPBREW
5454
return 0
5555
end
5656
end
@@ -601,13 +601,10 @@ if [ -z "$PHPBREW_SKIP_INIT" ]
601601
end
602602

603603
[ -z "$PHPBREW_ROOT" ]; and set -gx PHPBREW_ROOT "$HOME/.phpbrew"
604-
[ -z "$PHPBREW_BIN" ]; and set -gx PHPBREW_BIN "$PHPBREW_HOME/bin"
605604

606605
[ ! -d "$PHPBREW_ROOT" ]; and mkdir $PHPBREW_ROOT
607606
[ ! -d "$PHPBREW_HOME" ]; and mkdir $PHPBREW_HOME
608607

609-
[ ! -d $PHPBREW_BIN ]; and mkdir -p $PHPBREW_BIN
610-
611608
# top level options
612609
complete -f -c phpbrew -n "__fish_phpbrew_needs_command" -s v -l verbose -d "Print verbose message"
613610
complete -f -c phpbrew -n "__fish_phpbrew_needs_command" -s d -l debug -d "Print debug message"
@@ -620,7 +617,6 @@ complete -f -c phpbrew -n "__fish_phpbrew_needs_command" -l no-interact -d "Do n
620617
complete -f -c phpbrew -n "__fish_phpbrew_needs_command" -l no-progress -d "Do not display progress bar"
621618

622619
# commands
623-
complete -f -c phpbrew -n "__fish_phpbrew_needs_command" -a app -d "[deprecated] php app store"
624620
complete -f -c phpbrew -n "__fish_phpbrew_needs_command" -a archive -d "Build executable phar file from composer.json"
625621
complete -f -c phpbrew -n "__fish_phpbrew_needs_command" -a bash -d "This command generate a bash completion script automatically"
626622
complete -f -c phpbrew -n "__fish_phpbrew_needs_command" -a cd -d "Change to directories"
@@ -656,19 +652,6 @@ complete -f -c phpbrew -n "__fish_phpbrew_needs_command" -a use -d "Use php, swi
656652
complete -f -c phpbrew -n "__fish_phpbrew_needs_command" -a variants -d "List php variants"
657653
complete -f -c phpbrew -n "__fish_phpbrew_needs_command" -a zsh -d "This function generate a zsh-completion script automatically"
658654

659-
# app
660-
complete -f -c phpbrew -n "__fish_phpbrew_using_command app" -a get -d "[deprecated] Get PHP application"
661-
complete -f -c phpbrew -n "__fish_phpbrew_using_command app" -a list -d "[deprecated] List PHP applications"
662-
663-
# app get
664-
complete -x -c phpbrew -n "__fish_phpbrew_using_command app get" -l chmod -d "Set downloaded file mode"
665-
complete -x -c phpbrew -n "__fish_phpbrew_using_command app get" -l downloader -d "Use alternative downloader"
666-
complete -f -c phpbrew -n "__fish_phpbrew_using_command app get" -l continue -d "Continue getting a partially downloaded file"
667-
complete -x -c phpbrew -n "__fish_phpbrew_using_command app get" -l http-proxy -d "HTTP proxy address"
668-
complete -x -c phpbrew -n "__fish_phpbrew_using_command app get" -l http-proxy-auth -d "HTTP proxy authentication"
669-
complete -x -c phpbrew -n "__fish_phpbrew_using_command app get" -l connect-timeout -d "Connection timeout"
670-
complete -x -c phpbrew -n "__fish_phpbrew_using_command app get" -a "(__fish_phpbrew_arg_meta app.app.get 0 valid-values)" -d "Application name"
671-
672655
# archive
673656
complete -x -c phpbrew -n "__fish_phpbrew_using_command archive" -s d -l working-dir -d "If specified, use the given directory as working directory"
674657
complete -x -c phpbrew -n "__fish_phpbrew_using_command archive" -s c -l composer -d "The composer.json file"

src/PhpBrew/AppStore.php

-50
This file was deleted.

src/PhpBrew/Command/AppCommand.php

-33
This file was deleted.

src/PhpBrew/Command/AppCommand/GetCommand.php

-62
This file was deleted.

src/PhpBrew/Command/AppCommand/ListCommand.php

-27
This file was deleted.

src/PhpBrew/Console.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function options($opts)
2525
public function init()
2626
{
2727
parent::init();
28-
$this->command('app');
28+
2929
$this->command('init');
3030
$this->command('known');
3131
$this->command('install');

tests/PhpBrew/Command/AppCommandTest.php

-34
This file was deleted.

0 commit comments

Comments
 (0)