Skip to content

Commit

Permalink
Develop (#60)
Browse files Browse the repository at this point in the history
* Bump flex to ^1.17, v1.13 (#58)

https://symfony.com/blog/the-old-flex-infrastructure-is-shutting-down

Co-authored-by: Maciej Pilarczyk <[email protected]>

* Support PHP 8.1 (#59)

* Update symfony 5.4

* Update symfony 5.4

* v1.4.0

Co-authored-by: Emil <[email protected]>
Co-authored-by: Paweł Podkalicki <[email protected]>
  • Loading branch information
3 people authored Jul 6, 2022
1 parent ef5f126 commit 8674406
Show file tree
Hide file tree
Showing 186 changed files with 1,831 additions and 2,099 deletions.
5 changes: 2 additions & 3 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
# Real environment variables win over .env files.
#
# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
# https://symfony.com/doc/current/configuration/secrets.html
#
# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
Expand All @@ -31,9 +32,7 @@ APP_SECRET=00a2ba897e59fac27a0681e645119071
# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
#
# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
DATABASE_URL="mysql://db_user:[email protected]:3306/db_name?serverVersion=5.7"
# DATABASE_URL="postgresql://symfony:[email protected]:5432/app?serverVersion=13&charset=utf8"
DATABASE_URL="mysql://db_user:[email protected]:3306/db_name?serverVersion=5.7&charset=utf8mb4"
###< doctrine/doctrine-bundle ###

LOG_FILE_PATH=%kernel.logs_dir%/%kernel.environment%.log
Expand Down
3 changes: 2 additions & 1 deletion .env.test
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# define your env variables for the test env here
KERNEL_CLASS='Adshares\AdPay\Kernel'
KERNEL_CLASS='App\Kernel'
APP_SECRET='$ecretf0rt3st'
SYMFONY_DEPRECATIONS_HELPER=999999
PANTHER_APP_ENV=panther
PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
DATABASE_URL="mysql://adpay:[email protected]:3306/adpay_test?serverVersion=5.7&charset=utf8mb4"
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.4.0] - 2022-07-05
### Changed
- Support PHP 8.1
- Upgrade to Symfony 5.4

## [1.3.3] - 2022-02-23
### Added
- Support model type banners
Expand Down Expand Up @@ -70,7 +75,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Rewriting from Python to PHP


[Unreleased]: https://github.com/adshares/adpay/compare/v1.3.3...HEAD
[Unreleased]: https://github.com/adshares/adpay/compare/v1.4.0...HEAD
[1.4.0]: https://github.com/adshares/adpay/compare/v1.3.3...v1.4.0
[1.3.3]: https://github.com/adshares/adpay/compare/v1.3.2...v1.3.3
[1.3.2]: https://github.com/adshares/adpay/compare/v1.3.1...v1.3.2
[1.3.1]: https://github.com/adshares/adpay/compare/v1.3.0...v1.3.1
Expand Down
2 changes: 1 addition & 1 deletion bin/console
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php

use Adshares\AdPay\Kernel;
use App\Kernel;
use Symfony\Bundle\FrameworkBundle\Console\Application;

if (!is_file(dirname(__DIR__).'/vendor/autoload_runtime.php')) {
Expand Down
36 changes: 18 additions & 18 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,39 +24,39 @@
}
],
"require": {
"php": "^7.4",
"php": "^7.4|^8.1",
"ext-ctype": "*",
"ext-iconv": "*",
"ext-json": "*",
"doctrine/doctrine-bundle": "^2.4",
"doctrine/doctrine-migrations-bundle": "^3.1",
"doctrine/orm": "^2.11",
"psr/log": "^1.1",
"symfony/console": "^5.3",
"symfony/dotenv": "^5.3",
"symfony/flex": "^1.13",
"symfony/framework-bundle": "^5.3",
"symfony/lock": "^5.3",
"symfony/monolog-bundle": "^3.7",
"symfony/proxy-manager-bridge": "5.3.*",
"symfony/runtime": "^5.3",
"symfony/yaml": "^5.3"
"symfony/console": "^5.4",
"symfony/dotenv": "^5.4",
"symfony/flex": "^1.17",
"symfony/framework-bundle": "^5.4",
"symfony/lock": "^5.4",
"symfony/monolog-bundle": "^3.8",
"symfony/proxy-manager-bridge": "5.4.*",
"symfony/runtime": "^5.4",
"symfony/yaml": "^5.4"
},
"require-dev": {
"dama/doctrine-test-bundle": "^6.6",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7",
"php-parallel-lint/php-parallel-lint": "^1.3",
"phpcompatibility/php-compatibility": "^9.3",
"phpunit/phpunit": "^9.5",
"qossmic/deptrac-shim": "^0.14",
"qossmic/deptrac-shim": "^0.23",
"slevomat/coding-standard": "^7.0",
"squizlabs/php_codesniffer": "^3.6",
"symfony/browser-kit": "^5.3",
"symfony/css-selector": "^5.3",
"symfony/debug-bundle": "^5.3",
"symfony/browser-kit": "^5.4",
"symfony/css-selector": "^5.4",
"symfony/debug-bundle": "^5.4",
"symfony/maker-bundle": "^1.32",
"symfony/phpunit-bridge": "^6.0",
"symfony/stopwatch": "^5.3"
"symfony/stopwatch": "^5.4"
},
"config": {
"preferred-install": {
Expand All @@ -72,12 +72,12 @@
},
"autoload": {
"psr-4": {
"Adshares\\AdPay\\": "src/"
"App\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"Adshares\\AdPay\\Tests\\": "tests/"
"App\\Tests\\": "tests/"
}
},
"replace": {
Expand Down Expand Up @@ -119,7 +119,7 @@
"extra": {
"symfony": {
"allow-contrib": false,
"require": "5.3.*"
"require": "5.4.*"
}
}
}
Loading

0 comments on commit 8674406

Please sign in to comment.