Skip to content

Commit d6e7878

Browse files
authored
Update deps (#366)
* update deps * update tests * refactor rename Test.php to SolutionTest.php * improve composer config
1 parent d6fc536 commit d6e7878

File tree

105 files changed

+1789
-1116
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+1789
-1116
lines changed

Dockerfile

+22-16
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,37 @@
11
FROM hexletbasics/base-image
22

3+
WORKDIR /exercises-php
4+
5+
ENV COMPOSER_NO_INTERACTION=1
6+
ENV COMPOSER_ALLOW_SUPERUSER=1
7+
ENV COMPOSER_HOME=/tmp
8+
ENV COMPOSER_VERSION=2.8.6
9+
ENV PATH=/exercises-php/bin:/exercises-php/vendor/bin/:$PATH
10+
311
RUN apt-get update && \
4-
apt-get install -yqq \
12+
apt-get install -yqq --no-install-recommends \
513
php \
6-
php-common \
714
php-cli \
8-
php-gd \
15+
php-common \
916
php-curl \
17+
php-gd \
1018
php-mbstring \
11-
php-xml
19+
php-xdebug \
20+
php-xml && \
21+
apt-get clean && \
22+
rm -rf /var/lib/apt/lists/*
1223

13-
ENV COMPOSER_NO_INTERACTION 1
14-
ENV COMPOSER_ALLOW_SUPERUSER 1
15-
ENV COMPOSER_HOME /tmp
16-
ENV COMPOSER_VERSION 2.3.10
1724

18-
RUN php -r "readfile('https://getcomposer.org/installer');" > /composer-setup.php
19-
RUN php /composer-setup.php --install-dir=/usr/local/bin --filename=composer
25+
RUN php -r "readfile('https://getcomposer.org/installer');" > /composer-setup.php && \
26+
php /composer-setup.php --install-dir=/usr/local/bin --filename=composer && \
27+
rm /composer-setup.php
2028

21-
WORKDIR /exercises-php
22-
23-
RUN mkdir -p /usr/local/etc/php/conf.d/
24-
RUN echo "include_path = \".:/exercises-php\"" > /usr/local/etc/php/conf.d/code-basics.ini
29+
RUN mkdir -p /usr/local/etc/php/conf.d/ && \
30+
echo "include_path = \".:/exercises-php\"" > /usr/local/etc/php/conf.d/code-basics.ini && \
31+
echo "zend_extension=xdebug.so" > /usr/local/etc/php/conf.d/xdebug.ini && \
32+
echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/xdebug.ini
2533

2634
COPY composer.json composer.lock .
2735
RUN composer install
2836

2937
COPY . .
30-
31-
ENV PATH=/exercises-php/bin:$PATH

bin/test.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
php /exercises-php/vendor/bin/phpunit --colors=always \
2-
-c /exercises-php/phpunit.xml .
1+
phpunit -c /exercises-php/phpunit.xml .

composer.json

+20-14
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,31 @@
11
{
2+
"name": "hexlet-basics/exercises-php",
3+
"description": "Lessons for PHP course on code-basics.com",
4+
"type": "project",
5+
"license": "proprietary",
26
"require": {
3-
"squizlabs/php_codesniffer": "^3.7"
7+
"php": "^8.3"
48
},
9+
"authors": [
10+
{
11+
"name": "Kirill Mokevnin",
12+
"email": "[email protected]"
13+
},
14+
{
15+
"name": "Nikolay Gagarinov",
16+
"email": "[email protected]"
17+
}
18+
],
519
"autoload": {
6-
"psr-4": {"HexletBasics\\": "src/"},
720
"files": [
821
"src/Functions.php"
922
]
1023
},
11-
"scripts": {
12-
},
1324
"require-dev": {
14-
"symfony/var-dumper": "^7.2",
1525
"codedungeon/phpunit-result-printer": "^0.32.0",
16-
"phpunit/phpunit": "^9.5.16",
17-
"ngyuki/phpower": "dev-php83"
18-
},
19-
"repositories": [
20-
{
21-
"type": "vcs",
22-
"url": "https://github.com/fey/phpower"
23-
}
24-
]
26+
"phpunit/phpunit": "^11",
27+
"robiningelbrecht/phpunit-pretty-print": "^1.4",
28+
"squizlabs/php_codesniffer": "^3.7",
29+
"symfony/var-dumper": "^7.2"
30+
}
2531
}

0 commit comments

Comments
 (0)