Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: badges/poser
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.0.3
Choose a base ref
...
head repository: badges/poser
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Oct 9, 2020

  1. Copy the full SHA
    90c4e47 View commit details
  2. Merge pull request #59 from AlessandroMinoccheri/improve-psalm-3-level

    upgrade to level 3 of psalm
    JellyBellyDev authored Oct 9, 2020
    Copy the full SHA
    df0704b View commit details

Commits on Oct 11, 2020

  1. add option to sort packages

    garak committed Oct 11, 2020
    Copy the full SHA
    78f69eb View commit details
  2. Merge pull request #60 from badges/sort-packages

    add option to sort packages
    JellyBellyDev authored Oct 11, 2020
    Copy the full SHA
    f125d28 View commit details

Commits on Oct 25, 2020

  1. Copy the full SHA
    288c7da View commit details

Commits on Oct 26, 2020

  1. Copy the full SHA
    8513b46 View commit details
  2. Future-proofed gitignore

    GregOriol committed Oct 26, 2020
    Copy the full SHA
    2b1f6c1 View commit details
  3. Updated changelog

    GregOriol committed Oct 26, 2020
    Copy the full SHA
    fdd41a1 View commit details
  4. Merge pull request #62 from GregOriol/master

    Removed unnecessary composer symlinks (#61)
    JellyBellyDev authored Oct 26, 2020
    Copy the full SHA
    b086d72 View commit details

Commits on Dec 29, 2020

  1. Copy the full SHA
    f43bb20 View commit details
  2. Merge pull request #64 from badges/fixup/link-to-badge-poser

    fix(command): fix url to badge poser
    JellyBellyDev authored Dec 29, 2020
    Copy the full SHA
    3178d73 View commit details

Commits on Dec 30, 2020

  1. Copy the full SHA
    9d30da0 View commit details

Commits on Jan 2, 2021

  1. Copy the full SHA
    abc16d8 View commit details
  2. Copy the full SHA
    00a013d View commit details

Commits on Jan 3, 2021

  1. Merge pull request #67 from badges/feat/add-compatibility-with-php80

    feat(deps): add compatibility with php 8.0
    JellyBellyDev authored Jan 3, 2021
    Copy the full SHA
    c7a7e78 View commit details
  2. Copy the full SHA
    3c8f5c9 View commit details

Commits on Jan 4, 2021

  1. Merge pull request #69 from badges/feat/improvment-split-docker-images

    feat(docker): improvement split docker images
    JellyBellyDev authored Jan 4, 2021
    Copy the full SHA
    71c33ce View commit details
  2. added github actions

    change docker to docker github images
    
    update
    AlessandroMinoccheri committed Jan 4, 2021
    Copy the full SHA
    756463d View commit details
  3. Copy the full SHA
    149d4f7 View commit details
  4. Merge pull request #68 from AlessandroMinoccheri/github-actions

    Added github actions
    JellyBellyDev authored Jan 4, 2021
    Copy the full SHA
    940cbf3 View commit details
  5. Copy the full SHA
    92a6b8e View commit details
  6. Copy the full SHA
    2cfaf39 View commit details
  7. fixed changelog

    AlessandroMinoccheri committed Jan 4, 2021
    Copy the full SHA
    677bbbc View commit details
  8. Copy the full SHA
    d8c6beb View commit details
  9. Copy the full SHA
    2baefc8 View commit details
  10. Copy the full SHA
    148fdff View commit details

Commits on Jul 15, 2021

  1. psalm to level 2

    AlessandroMinoccheri committed Jul 15, 2021
    Copy the full SHA
    bac4ba8 View commit details
  2. Merge pull request #73 from badges/psalm-level-2

    psalm to level 2
    AlessandroMinoccheri authored Jul 15, 2021
    Copy the full SHA
    fc85c98 View commit details
  3. Copy the full SHA
    c8b2cf6 View commit details
  4. Merge pull request #74 from badges/release/v2-1-0

    chore: preprare release v2.1.0
    JellyBellyDev authored Jul 15, 2021
    Copy the full SHA
    324c4fe View commit details

Commits on Sep 7, 2021

  1. Copy the full SHA
    0fab9cd View commit details

Commits on Sep 8, 2021

  1. Merge pull request #76 from badges/add-php-require-badge-to-readme

    added required php version badge to readme file
    JellyBellyDev authored Sep 8, 2021
    Copy the full SHA
    f82a168 View commit details

Commits on Jan 4, 2022

  1. Copy the full SHA
    0fd8c01 View commit details

Commits on Jan 8, 2022

  1. Merge pull request #78 from badges/feat/add-compatibility-sf6

    feat: add compatibility to sf6
    garak authored Jan 8, 2022
    Copy the full SHA
    ec59306 View commit details

Commits on Jan 10, 2022

  1. release: v2.2.0

    JellyBellyDev committed Jan 10, 2022
    Copy the full SHA
    d8ed256 View commit details
  2. Merge pull request #79 from badges/release/2-2-0

    release: v2.2.0
    JellyBellyDev authored Jan 10, 2022
    Copy the full SHA
    49e91ea View commit details

Commits on Jan 20, 2022

  1. update php-cs-fixer

    garak committed Jan 20, 2022
    Copy the full SHA
    5a313af View commit details
  2. Merge pull request #81 from garak/update-csfixer

    update php-cs-fixer
    JellyBellyDev authored Jan 20, 2022
    Copy the full SHA
    1f9a83b View commit details

Commits on Jan 21, 2022

  1. run php-cs-fixer in Actions

    garak committed Jan 21, 2022
    Copy the full SHA
    8c48691 View commit details

Commits on Jan 22, 2022

  1. Merge pull request #82 from garak/csfix-action

    run php-cs-fixer in Actions
    JellyBellyDev authored Jan 22, 2022
    Copy the full SHA
    575772e View commit details
  2. fix: yaml syntax CI

    JellyBellyDev committed Jan 22, 2022
    Copy the full SHA
    3d9a383 View commit details
  3. Merge pull request #83 from badges/fix/yaml-syntax

    fix: yaml syntac CI
    JellyBellyDev authored Jan 22, 2022
    Copy the full SHA
    07257c0 View commit details

Commits on Jan 23, 2022

  1. add .gitattributes

    garak committed Jan 23, 2022
    Copy the full SHA
    5a5843f View commit details

Commits on Jan 24, 2022

  1. Merge pull request #85 from garak/gitattributes

    add .gitattributes
    JellyBellyDev authored Jan 24, 2022
    Copy the full SHA
    c3502f0 View commit details

Commits on Jan 26, 2022

  1. Copy the full SHA
    b6c2fcb View commit details

Commits on Jan 27, 2022

  1. Copy the full SHA
    ee5eddf View commit details
  2. Fixed CS

    ricardoboss committed Jan 27, 2022
    Copy the full SHA
    2d20de5 View commit details

Commits on Feb 14, 2022

  1. Copy the full SHA
    fa4d221 View commit details
  2. Copy the full SHA
    80a5330 View commit details
  3. Fixed typo

    ricardoboss committed Feb 14, 2022
    Copy the full SHA
    f1782b3 View commit details
Showing with 25,647 additions and 260 deletions.
  1. +0 −83 .circleci/config.yml
  2. +0 −17 .circleci/images/Dockerfile
  3. +21 −0 .docker/base/php81/Dockerfile
  4. +21 −0 .docker/base/php82/Dockerfile
  5. +21 −0 .docker/base/php83/Dockerfile
  6. +5 −0 .docker/development/php81/Dockerfile
  7. +5 −0 .docker/development/php82/Dockerfile
  8. +5 −0 .docker/development/php83/Dockerfile
  9. +12 −0 .gitattributes
  10. +15 −0 .github/workflows/commit-lint.yml
  11. +55 −0 .github/workflows/php.yml
  12. +35 −0 .github/workflows/release.yml
  13. +3 −5 .gitignore
  14. +23 −0 .php-cs-fixer.php
  15. +0 −29 .php_cs
  16. +62 −6 CHANGELOG.md
  17. +24 −3 CONTRIBUTING.md
  18. +23 −14 README.md
  19. +0 −1 bin/php-parse
  20. +0 −1 bin/psalm
  21. +0 −1 bin/psalm-language-server
  22. +0 −1 bin/psalm-plugin
  23. +0 −1 bin/psalm-refactor
  24. +0 −1 bin/psalter
  25. +23 −11 composer.json
  26. +19 −3 docker-compose.yml
  27. +0 −23 docker/php-fpm/Dockerfile
  28. +4 −4 features/bootstrap/FeatureContext.php
  29. +2 −1 psalm.xml
  30. +15 −0 spec/PUGX/Poser/Calculator/GDTextSizeCalculatorSpec.php
  31. +15 −0 spec/PUGX/Poser/Calculator/SvgTextSizeCalculatorSpec.php
  32. +2 −2 spec/PUGX/Poser/PoserSpec.php
  33. +2 −2 spec/PUGX/Poser/Render/SvgFlatRenderSpec.php
  34. +2 −2 spec/PUGX/Poser/Render/SvgFlatSquareRenderSpec.php
  35. +2 −2 spec/PUGX/Poser/Render/SvgPlasticRenderSpec.php
  36. +6 −1 src/Badge.php
  37. +251 −0 src/Calculator/Font/DejaVuSans.svg
  38. +2,209 −0 src/Calculator/Font/Verdana-Bold.svg
  39. +22,495 −0 src/Calculator/Font/Verdana.svg
  40. +0 −1 src/Calculator/GDTextSizeCalculator.php
  41. +41 −0 src/Calculator/SvgTextSizeCalculator.php
  42. +1 −1 src/Image.php
  43. +1 −14 src/Poser.php
  44. +15 −16 src/Render/LocalSvgRenderer.php
  45. +77 −0 src/Render/SvgForTheBadgeRenderer.php
  46. +11 −0 src/Resources/templates/for-the-badge.svg
  47. +29 −9 src/UI/Command.php
  48. +9 −5 src/UI/SingleCommandApplication.php
  49. +86 −0 src/ValueObject/InputRequest.php
83 changes: 0 additions & 83 deletions .circleci/config.yml

This file was deleted.

17 changes: 0 additions & 17 deletions .circleci/images/Dockerfile

This file was deleted.

21 changes: 21 additions & 0 deletions .docker/base/php81/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
FROM php:8.1-fpm

USER root

# install system packages
RUN apt-get update \
&& apt-get -y install git wget \
&& apt-get install -qqy libzip-dev libpng-dev libjpeg-dev libfreetype6-dev \
&& apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*

# configure php packages
RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/

# install php requirements
RUN docker-php-ext-install zip iconv gd

# install xdebug
RUN pecl install xdebug \
&& docker-php-ext-enable xdebug

COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
21 changes: 21 additions & 0 deletions .docker/base/php82/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
FROM php:8.2-fpm

USER root

# install system packages
RUN apt-get update \
&& apt-get -y install git wget \
&& apt-get install -qqy libzip-dev libpng-dev libjpeg-dev libfreetype6-dev \
&& apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*

# configure php packages
RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/

# install php requirements
RUN docker-php-ext-install zip iconv gd

# install xdebug
RUN pecl install xdebug \
&& docker-php-ext-enable xdebug

COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
21 changes: 21 additions & 0 deletions .docker/base/php83/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
FROM php:8.3-fpm

USER root

# install system packages
RUN apt-get update \
&& apt-get -y install git wget \
&& apt-get install -qqy libzip-dev libpng-dev libjpeg-dev libfreetype6-dev \
&& apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*

# configure php packages
RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/

# install php requirements
RUN docker-php-ext-install zip iconv gd

# install xdebug
RUN pecl install xdebug \
&& docker-php-ext-enable xdebug

COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
5 changes: 5 additions & 0 deletions .docker/development/php81/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM pugx/poser:php81

USER root

WORKDIR "/application"
5 changes: 5 additions & 0 deletions .docker/development/php82/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM pugx/poser:php82

USER root

WORKDIR "/application"
5 changes: 5 additions & 0 deletions .docker/development/php83/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM pugx/poser:php83

USER root

WORKDIR "/application"
12 changes: 12 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/.docker export-ignore
/.git* export-ignore
/.php-cs-fixer.php export-ignore
/*.svg export-ignore
/CHANGELOG.md export-ignore
/CONTRIBUTING.md export-ignore
/docker-compose.yml export-ignore
/features export-ignore
/phpspec*.yml export-ignore
/psalm.xml export-ignore
/README.md export-ignore
/spec export-ignore
15 changes: 15 additions & 0 deletions .github/workflows/commit-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: commit-lint

on: [pull_request]

jobs:
commit-lint:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:
fetch-depth: ${{ github.event.pull_request.commits }}
ref: ${{ github.event.pull_request.head.sha }}
- uses: bugbundle/commits@v1.1.0
id: commits
- run: echo ${{ steps.commits.outputs.major }}.${{ steps.commits.outputs.minor }}.${{ steps.commits.outputs.patch }}
55 changes: 55 additions & 0 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Build

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]

jobs:
cs-fix:
runs-on: ubuntu-22.04
name: PHP-CS-Fixer
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Fix CS
uses: docker://oskarstark/php-cs-fixer-ga

build:

strategy:
matrix:
container: [ "php81", "php82", "php83" ]

runs-on: ubuntu-latest
container: pugx/poser:${{ matrix.container }}
steps:
- uses: actions/checkout@v3

- name: Validate composer.json
run: composer validate

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v3
with:
path: vendor
key: ${{ runner.os }}-php-${{ matrix.container }}-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-php-${{ matrix.container }}
- name: Install dependencies
run: composer install --prefer-dist --no-progress

- name: Coding Standard Checks
run: PHP_CS_FIXER_IGNORE_ENV=1 bin/php-cs-fixer fix --verbose --diff --dry-run

- name: Run tests (phpspec)
run: ./bin/phpspec run --format=pretty

- name: Run coverage tests (phpspec)
run: XDEBUG_MODE=coverage bin/phpspec run -f progress -c phpspec-coverage.yml

- name: Run behat tests
run: ./bin/behat --snippets-for
35 changes: 35 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Create release

on:
workflow_dispatch:

jobs:
changelog:
name: Create changelog
runs-on: ubuntu-latest

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

- name: Conventional Changelog Action
id: changelog
uses: TriPSs/conventional-changelog-action@v5
with:
preset: conventionalcommits
github-token: ${{ secrets.GH_TOKEN }}
git-user-name: ${{ github.actor }}
git-user-email: ${{ github.actor }}@users.noreply.github.com
tag-prefix: 'v'
input-file: 'CHANGELOG.md'
output-file: 'CHANGELOG.md'
skip-on-empty: false
skip-version-file: true

- name: Create Release
uses: softprops/action-gh-release@v1
if: ${{ steps.changelog.outputs.skipped == 'false' }}
with:
token: ${{ secrets.GH_TOKEN }}
tag_name: ${{ steps.changelog.outputs.tag }}
body: ${{ steps.changelog.outputs.clean_changelog }}
8 changes: 3 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/bin/behat
/bin/php-cs-fixer
/bin/phpspec
/bin/yaml-lint
/bin/*
!/bin/poser
/coverage
/vendor
.php_cs.cache
/.*.cache
composer.lock
23 changes: 23 additions & 0 deletions .php-cs-fixer.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?php
// see https://github.com/FriendsOfPHP/PHP-CS-Fixer

$finder = PhpCsFixer\Finder::create()
->in(__DIR__)
->exclude(['vendor'])
;

return (new PhpCsFixer\Config())
->setRiskyAllowed(true)
->setRules([
'@Symfony' => true,
'@Symfony:risky' => true,
'@PHP81Migration' => true,
'declare_strict_types' => false,
'native_function_invocation' => ['include' => ['@all']],
'concat_space' => ['spacing' => 'one'],
'binary_operator_spaces' => ['operators' => ['=>' => 'align', '=' => 'align']],
'phpdoc_align' => ['align' => 'vertical'],
'phpdoc_summary' => false,
])
->setFinder($finder)
;
29 changes: 0 additions & 29 deletions .php_cs

This file was deleted.

Loading