Skip to content

Commit

Permalink
Merge pull request #23 from spryker-eco/bugfix/cc-32047-fix-guzzle-li…
Browse files Browse the repository at this point in the history
…brary-dependency

CC-32047 Fix Middleware connector
  • Loading branch information
spryker-release-bot committed Dec 8, 2023
2 parents 0d46d8f + 9dd37cc commit 31766ba
Show file tree
Hide file tree
Showing 15 changed files with 547 additions and 94 deletions.
4 changes: 2 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
*.mo binary
*.pdf binary
*.xsd binary
*.ts binary
*.exe binary

# Remove files for archives generated using `git archive`
codeception.yml export-ignore
architecture-baseline.json export-ignore
dependency.json export-ignore
phpstan.json export-ignore
phpstan.neon export-ignore
psalm-report.json export-ignore linguist-generated=true
tooling.yml export-ignore
.coveralls.yml export-ignore
.travis.yml export-ignore
Expand Down
126 changes: 126 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
name: CI

env:
APPLICATION_ENV: 'development'
APPLICATION_STORE: 'DE'
PROJECT: 'Akeneo PIM'
DATABASE_VERSION: 10.2
DATABASE_HOST: 127.0.0.1
DATABASE_PORT: 3306
DATABASE_NAME: eu-docker
DATABASE_USERNAME: root
DATABASE_PASSWORD: secret
DATABASE_ROOT_PASSWORD: secret
DATABASE_ALLOW_EMPTY_PASSWORD: false
DATABASE_CHARACTER_SET: utf8
DATABASE_COLLATE: utf8_general_ci

on:
pull_request:
push:
branches:
- 'master'
workflow_dispatch:

jobs:
setup:
name: Setup Database MariaDB
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
- uses: getong/mariadb-action@v1.1
with:
host port: ${{ env.DATABASE_PORT }}
container port: ${{ env.DATABASE_PORT }}
character set server: ${{ env.DATABASE_CHARACTER_SET }}
collation server: ${{ env.DATABASE_COLLATE }}
mariadb version: ${{ env.DATABASE_VERSION }}
mysql database: ${{ env.DATABASE_NAME }}
mysql root password: ${{ env.DATABASE_ROOT_PASSWORD }}
mysql user: ${{ env.DATABASE_USERNAME }}
mysql password: ${{ env.DATABASE_PASSWORD }}

ci:
name: Akeneo PIM (PHP ${{ matrix.php-versions }})
needs: setup
runs-on: ubuntu-22.04

strategy:
fail-fast: false
matrix:
php-versions:
- '7.2'
- '8.2'

services:
mariadb:
image: mariadb:10.2
env:
MYSQL_ALLOW_EMPTY_PASSWORD: false
MYSQL_ROOT_PASSWORD: secret
MYSQL_DATABASE: eu-docker
ports:
- 3306:3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3

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

- name: Setup PHP ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
extensions: mbstring, intl, bcmath, pdo_mysql

- name: Get composer cache directory
id: composer-cache
run: |
echo "::set-output name=dir::$(composer config cache-files-dir)"
- uses: actions/cache@v2
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-${{ matrix.php-versions }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: ${{ runner.os }}-${{ matrix.php-versions }}-composer-

- name: Composer validate
run: composer validate

- name: Composer version
run: composer --version

- name: Composer install
run: composer install --prefer-dist --no-interaction --optimize-autoloader

- name: PHP syntax validation
run: find ./src -path src -prune -o -type f -name '*.php' -print0 | xargs -0 -n1 -P4 php -l -n | (! grep -v "No syntax errors detected" )

lowest:
name: Akeneo PIM Prefer Lowest (PHP ${{ matrix.php-versions }})
runs-on: ubuntu-22.04

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

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.2'
extensions: mbstring, intl, bcmath, pdo_mysql

- name: Composer Install
run: composer install --prefer-dist --no-interaction --profile

- name: Composer Update
run: composer update --prefer-lowest --prefer-dist --no-interaction --profile -vvv

- name: Prefer lowest installation
run: composer require --dev dereuromark/composer-prefer-lowest;

- name: PHP syntax validation
run: find ./src -path src -prune -o -type f -name '*.php' -print0 | xargs -0 -n1 -P4 php -l -n | (! grep -v "No syntax errors detected" )

- name: Prefer lowest validation
run: vendor/bin/validate-prefer-lowest -m
75 changes: 0 additions & 75 deletions .travis.yml

This file was deleted.

7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
# AkeneoPim Module

[![Build Status](https://travis-ci.org/spryker-eco/akeneo-pim.svg?branch=master)](https://travis-ci.org/spryker-eco/akeneo-pim)
[![CI](https://github.com/spryker-eco/akeneo-pim/actions/workflows/ci.yml/badge.svg)](https://github.com/spryker-eco/akeneo-pim/actions/workflows/ci.yml)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/spryker-eco/akeneo-pim/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/spryker-eco/akeneo-pim/?branch=master)
[![Build Status](https://scrutinizer-ci.com/g/spryker-eco/akeneo-pim/badges/build.png?b=master)](https://scrutinizer-ci.com/g/spryker-eco/akeneo-pim/build-status/master)
[![Latest Stable Version](https://poser.pugx.org/spryker-eco/akeneo-pim/v/stable.svg)](https://packagist.org/packages/spryker-eco/akeneo-pim)
[![License](https://img.shields.io/github/license/spryker-eco/akeneo-pim.svg?b=master)](https://github.com/spryker-eco/akeneo-pim)
[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.2-8892BF.svg)](https://php.net/)

## Installation

Expand All @@ -12,4 +15,4 @@ composer require spryker-eco/akeneo-pim

## Documentation

[Documentation](https://docs.spryker.com/docs/scos/dev/technology-partner-guides/202108.0/product-information-pimerp/akeneo/installing-and-configuring-akeneo.html)
[Spryker Documentation](https://docs.spryker.com)
9 changes: 9 additions & 0 deletions architecture-baseline.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[
{
"fileName": "src/SprykerEco/Service/AkeneoPim/Dependencies/External/Api/Adapter/HttpClient/Promise.php",
"description": "Method `SprykerEco\\Service\\AkeneoPim\\Dependencies\\External\\Api\\Adapter\\HttpClient\\Promise::then()` must have return type.",
"rule": "ExternalMethodExtensionReturnTypeRule",
"ruleset": "Spryker",
"priority": "1"
}
]
4 changes: 2 additions & 2 deletions codeception.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ include:
paths:
tests: tests
support: .
log: tests/_output
output: tests/_output
data: tests/_data
envs: tests/_envs

Expand All @@ -21,4 +21,4 @@ coverage:
enabled: true
whitelist:
include:
- 'src/*'
- 'src/*'
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"require": {
"akeneo/api-php-client": "^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0",
"php": ">=7.2",
"php-http/guzzle6-adapter": "^1.0.0 || ^2.0.0",
"spryker/kernel": "^3.0.0"
"guzzlehttp/guzzle": "^6.0.0 || ^7.0.0",
"spryker/kernel": "^3.30.0"
},
"require-dev": {
"spryker/code-sniffer": "*"
Expand Down
3 changes: 3 additions & 0 deletions phpstan.neon
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
parameters:
level: 7
checkMissingIterableValueType: false
104 changes: 104 additions & 0 deletions psalm-report.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 31766ba

Please sign in to comment.