Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: PHP static analysis

on:
push:
branches:
- master
pull_request: null

jobs:
phpstan:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
php: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]

name: PHPStan - PHP ${{ matrix.php }}

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
coverage: none # disable xdebug, pcov

- name: Composer install phpstan
run: composer require --dev --no-update phpstan/phpstan-shim:^0.9

- name: PHPStan analyse
run: vendor/phpstan/phpstan-shim/phpstan.phar analyse --ansi --no-progress -l7 -c phpstan.neon src tests/KdybyTests
32 changes: 32 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Tests

on:
push:
branches:
- master
pull_request: null

jobs:
phpunit:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
php: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]

name: PHPunit - PHP ${{ matrix.php }}

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}

- name: Composer update
run: composer update --no-progress --no-interaction

- name: PHPunit
run: vendor/bin/tester ./tests/KdybyTests/
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"nette/http": "^3.0",
"nette/neon": "^3.0",
"nette/php-generator": "^3.0.1@dev",
"nette/reflection": "^2.4.2@dev",
"nette/utils": "^3.0",
"psr/log": "^1.0",
"symfony/translation": "^3.4 || ^4.0",
Expand Down
4 changes: 2 additions & 2 deletions src/DI/TranslationExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
use Nette\DI\Statement;
use Nette\PhpGenerator\ClassType as ClassTypeGenerator;
use Nette\PhpGenerator\PhpLiteral;
use Nette\Reflection\ClassType as ReflectionClassType;
use Nette\Schema\Expect;
use Nette\Schema\Schema;
use Nette\Utils\Finder;
use Nette\Utils\Validators;
use ReflectionClass;
use Symfony\Component\Translation\Extractor\ChainExtractor;
use Symfony\Component\Translation\Formatter\IntlFormatter;
use Symfony\Component\Translation\Formatter\IntlFormatterInterface;
Expand Down Expand Up @@ -451,7 +451,7 @@ protected function validateResource($format, $file, $locale, $domain)
try {
/** @var \Nette\DI\Definitions\ServiceDefinition $def */
$def = $builder->getDefinition($this->loaders[$format]);
$refl = ReflectionClassType::from($def->getEntity() ?: $def->getClass());
$refl = new ReflectionClass($def->getEntity() ?: $def->getClass());
$method = $refl->getConstructor();
if ($method !== NULL && $method->getNumberOfRequiredParameters() > 1) {
return;
Expand Down
4 changes: 2 additions & 2 deletions src/Diagnostics/Panel.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
use Kdyby\Translation\Translator;
use Nette\Application\Application;
use Nette\Application\Request;
use Nette\Reflection\ClassType;
use Nette\Utils\Arrays;
use Nette\Utils\Html;
use Nette\Utils\Strings;
use ReflectionClass;
use Symfony\Component\Translation\Loader\YamlFileLoader;
use Tracy\BlueScreen;
use Tracy\Debugger;
Expand Down Expand Up @@ -275,7 +275,7 @@ public function setLocaleResolvers(array $resolvers)
{
$this->localeResolvers = [];
foreach ($resolvers as $resolver) {
$this->localeResolvers[ClassType::from($resolver)->getShortName()] = $resolver;
$this->localeResolvers[(new ReflectionClass($resolver))->getShortName()] = $resolver;
}
}

Expand Down