Skip to content

Commit d44f395

Browse files
authored
Deleted doctrine/common which is conflicted with hyperf/utils. (#49)
* Deleted useless code. * Update Dockerfile * Update
1 parent 1448683 commit d44f395

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
# @license https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
77

8-
FROM hyperf/hyperf:7.2-alpine-v3.9-cli
8+
FROM hyperf/hyperf:7.4-alpine-v3.11-cli
99
LABEL maintainer="Hyperf Developers <[email protected]>" version="1.0" license="MIT" app.name="Hyperf"
1010

1111
##
@@ -15,13 +15,12 @@ LABEL maintainer="Hyperf Developers <[email protected]>" version="1.0" license="MI
1515
ARG timezone
1616

1717
ENV TIMEZONE=${timezone:-"Asia/Shanghai"} \
18-
COMPOSER_VERSION=1.9.1 \
18+
COMPOSER_VERSION=1.10.10 \
1919
APP_ENV=prod \
2020
SCAN_CACHEABLE=(true)
2121

2222
# update
2323
RUN set -ex \
24-
&& apk update \
2524
# install composer
2625
&& cd /tmp \
2726
&& wget https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar \
@@ -35,9 +34,9 @@ RUN set -ex \
3534
&& cd /etc/php7 \
3635
# - config PHP
3736
&& { \
38-
echo "upload_max_filesize=100M"; \
39-
echo "post_max_size=108M"; \
40-
echo "memory_limit=1024M"; \
37+
echo "upload_max_filesize=128M"; \
38+
echo "post_max_size=128M"; \
39+
echo "memory_limit=1G"; \
4140
echo "date.timezone=${TIMEZONE}"; \
4241
} | tee conf.d/99_overrides.ini \
4342
# - config timezone

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"swoole/ide-helper": "^4.5",
3131
"friendsofphp/php-cs-fixer": "^2.14",
3232
"mockery/mockery": "^1.0",
33-
"doctrine/common": "^2.9",
3433
"phpstan/phpstan": "^0.12",
3534
"hyperf/devtool": "~2.0.0",
3635
"hyperf/testing": "~2.0.0"

config/routes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515

1616
Router::get('/favicon.ico', function () {
1717
return '';
18-
});
18+
});

phpstan.neon

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@
44
# vendor/bin/phpstan analyse app --memory-limit 200M -l 0
55
#
66
parameters:
7+
reportUnmatchedIgnoredErrors: false
78
ignoreErrors:
8-
# - '#Static call to instance method Hyperf\\DbConnection\\Db::[a-zA-Z0-9\\_]+\(\)#'
9+
- '#Static call to instance method Hyperf\\HttpServer\\Router\\Router::[a-zA-Z0-9\\_]+\(\)#'
10+
- '#Static call to instance method Hyperf\\DbConnection\\Db::[a-zA-Z0-9\\_]+\(\)#'

0 commit comments

Comments
 (0)