Skip to content

Commit 41cb112

Browse files
AsisyasAsisyas
authored
Merge pull request #3 from Micro-PHP/v1.1
v1.0 changes
2 parents f07777a + be57c90 commit 41cb112

34 files changed

+1204
-144
lines changed

‎.gitattributes‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/.github export-ignore
2+
/tests export-ignore
3+
/phpunit.xml.dist export-ignore
4+
/.gitattributes export-ignore
5+
/.gitignore export-ignore
6+
/.php-cs-fixer.dist.php export-ignore
7+
/psalm.xml export-ignore
8+
9+
*.php diff=php

‎.github/workflows/.editorconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[{*.yaml,*.yml}]
2+
indent_size = 2

‎.github/workflows/ci.yaml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: Plugin CI
2+
on:
3+
push:
4+
branches: [ 'master' ]
5+
pull_request:
6+
7+
env:
8+
PHP_CS_FIXER_IGNORE_ENV: 1
9+
XDEBUG_MODE: coverage
10+
11+
jobs:
12+
tests:
13+
name: "Tests ${{ matrix.php-version }} deps ${{ matrix.dependency-versions }}"
14+
runs-on: ubuntu-22.04
15+
16+
strategy:
17+
fail-fast: false
18+
matrix:
19+
# normal, highest, non-dev installs
20+
php-version: [ '8.2' ]
21+
dependency-versions: [ 'highest' ]
22+
include:
23+
# testing lowest PHP version with the lowest dependencies
24+
# - php-version: '8.2'
25+
# dependency-versions: 'lowest'
26+
27+
# testing dev versions with the highest PHP
28+
- php-version: '8.2'
29+
dependency-versions: 'highest'
30+
31+
steps:
32+
- name: "Checkout code"
33+
uses: "actions/checkout@v2"
34+
35+
- name: "Install PHP"
36+
uses: "shivammathur/setup-php@v2"
37+
with:
38+
coverage: "none"
39+
php-version: "${{ matrix.php-version }}"
40+
41+
- name: "Composer install"
42+
uses: "ramsey/composer-install@v2"
43+
with:
44+
dependency-versions: "${{ matrix.dependency-versions }}"
45+
composer-options: "--prefer-dist --no-progress"
46+
47+
- name: Run tests
48+
run: composer run test

‎.gitignore‎

100755100644
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1-
vendor/
1+
vendor
22
composer.lock
33
.phpunit.result.cache
4+
.php-cs-fixer.cache
5+
test-coverage-report
6+
phpunit.xml
7+
.php-cs-fixer.php
8+
phpstan.neon

‎.php-cs-fixer.dist.php‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?php
2+
3+
if (!file_exists(__DIR__.'/src')) {
4+
exit(0);
5+
}
6+
7+
$finder = (new PhpCsFixer\Finder())
8+
->in(__DIR__.'/src')
9+
->in(__DIR__.'/tests')
10+
;
11+
12+
return (new PhpCsFixer\Config())
13+
->setRules(array(
14+
'@Symfony' => true,
15+
'@Symfony:risky' => true,
16+
'protected_to_private' => false,
17+
'semicolon_after_instruction' => false,
18+
'header_comment' => [
19+
'header' => <<<EOF
20+
This file is part of the Micro framework package.
21+
22+
(c) Stanislau Komar <kost@micro-php.net>
23+
24+
For the full copyright and license information, please view the LICENSE
25+
file that was distributed with this source code.
26+
EOF
27+
]
28+
))
29+
->setRiskyAllowed(true)
30+
->setFinder($finder);

‎composer.json‎

Lines changed: 48 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
{
22
"name": "micro/plugin-logger-core",
33
"description": "Micro Framework: Logger plugin",
4-
"type": "library",
5-
"version": "1.0",
64
"license": "MIT",
7-
"autoload": {
8-
"psr-4": {
9-
"Micro\\Plugin\\Logger\\": "src/"
10-
}
11-
},
5+
"type": "library",
126
"authors": [
137
{
148
"name": "Stanislau.Komar",
@@ -17,7 +11,52 @@
1711
],
1812
"require": {
1913
"micro/kernel": "^1",
20-
"php": ">=8.0",
21-
"psr/log": "^1|^2|^3"
14+
"micro/kernel-boot-configuration": "^1",
15+
"micro/kernel-boot-dependency": "^1",
16+
"psr/log": "^1 || ^2 || ^3"
17+
},
18+
"require-dev": {
19+
"ergebnis/composer-normalize": "^2.29",
20+
"friendsofphp/php-cs-fixer": "^3.13",
21+
"phpstan/phpstan": "^1.9",
22+
"phpunit/php-code-coverage": "^9.2",
23+
"phpunit/phpunit": "^9.5",
24+
"vimeo/psalm": "^5.2"
25+
},
26+
"autoload": {
27+
"psr-4": {
28+
"Micro\\Plugin\\Logger\\": "src/"
29+
}
30+
},
31+
"autoload-dev": {
32+
"psr-4": {
33+
"Micro\\Plugin\\Logger\\Test\\Unit\\": "tests/Unit"
34+
}
35+
},
36+
"config": {
37+
"allow-plugins": {
38+
"ergebnis/composer-normalize": true
39+
},
40+
"sort-packages": true
41+
},
42+
"scripts": {
43+
"coverage": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --coverage-text",
44+
"coverage-html": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --coverage-html ./test-coverage-report",
45+
"php-cs-fix": "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --verbose --using-cache=no",
46+
"php-cs-try": "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --verbose --dry-run --using-cache=no",
47+
"phpstan": "./vendor/bin/phpstan analyze --no-progress",
48+
"phpunit": "./vendor/bin/phpunit",
49+
"psalm": "./vendor/bin/psalm --no-progress --show-info=true",
50+
"statics": [
51+
"@phpstan",
52+
"@psalm",
53+
"@php-cs-try"
54+
],
55+
"test": [
56+
"@statics",
57+
"composer validate --strict",
58+
"composer normalize",
59+
"@coverage"
60+
]
2261
}
2362
}

‎phpstan.neon.dist‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
parameters:
2+
level: 7
3+
paths:
4+
- src

‎phpunit.xml.dist‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- https://phpunit.readthedocs.io/en/9.5/configuration.html#the-phpunit-element -->
3+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
5+
backupGlobals="false"
6+
bootstrap="vendor/autoload.php"
7+
colors="true"
8+
failOnRisky="true"
9+
failOnWarning="true"
10+
>
11+
<php>
12+
<ini name="error_reporting" value="-1" force="true"/>
13+
</php>
14+
<testsuites>
15+
<testsuite name="Unit tests">
16+
<directory>tests/Unit</directory>
17+
</testsuite>
18+
</testsuites>
19+
<filter>
20+
<whitelist>
21+
<directory suffix=".php">src/</directory>
22+
<exclude>
23+
<directory>src/Exception</directory>
24+
<file>src/LoggerPlugin.php</file>
25+
</exclude>
26+
</whitelist>
27+
</filter>
28+
<coverage>
29+
<include>
30+
<directory suffix=".php">src</directory>
31+
</include>
32+
<report>
33+
<html outputDirectory="test-coverage-report/" />
34+
</report>
35+
</coverage>
36+
</phpunit>

‎psalm.xml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0"?>
2+
<psalm
3+
errorLevel="2"
4+
resolveFromConfigFile="true"
5+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6+
xmlns="https://getpsalm.org/schema/config"
7+
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
8+
>
9+
<projectFiles>
10+
<directory name="src" />
11+
<ignoreFiles>
12+
<directory name="vendor" />
13+
</ignoreFiles>
14+
15+
</projectFiles>
16+
17+
<issueHandlers>
18+
19+
<UnnecessaryVarAnnotation>
20+
<errorLevel type="suppress">
21+
<file name="src/LoggerPlugin.php"/>
22+
</errorLevel>
23+
</UnnecessaryVarAnnotation>
24+
25+
<MissingConstructor>
26+
<errorLevel type="suppress">
27+
<file name="src/LoggerPlugin.php"/>
28+
</errorLevel>
29+
</MissingConstructor>
30+
31+
<ImplementedReturnTypeMismatch>
32+
<errorLevel type="suppress">
33+
<file name="src/LoggerPlugin.php"/>
34+
</errorLevel>
35+
</ImplementedReturnTypeMismatch>
36+
</issueHandlers>
37+
38+
</psalm>

‎src/Business/Factory/LoggerFactoryInterface.php‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
<?php
22

3+
/*
4+
* This file is part of the Micro framework package.
5+
*
6+
* (c) Stanislau Komar <kost@micro-php.net>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Micro\Plugin\Logger\Business\Factory;
413

14+
use Micro\Plugin\Logger\Configuration\LoggerProviderTypeConfigurationInterface;
515
use Psr\Log\LoggerInterface;
616

717
interface LoggerFactoryInterface
818
{
9-
/**
10-
* @param string $loggerName
11-
*
12-
* @return LoggerInterface
13-
*/
14-
public function create(string $loggerName): LoggerInterface;
19+
public function create(LoggerProviderTypeConfigurationInterface $loggerProviderTypeConfiguration): LoggerInterface;
1520
}

0 commit comments

Comments
 (0)