Skip to content

Commit 6a7d2f6

Browse files
committed
Resolve conflicts between 1.6 and 1.7
2 parents 5613df8 + 4b1347a commit 6a7d2f6

File tree

68 files changed

+1272
-490
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1272
-490
lines changed
Lines changed: 50 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,52 @@ jobs:
1414
tests:
1515
runs-on: ubuntu-latest
1616

17-
name: "Sylius ${{ matrix.sylius }}, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, MySQL ${{ matrix.mysql }}, State Machine Adapter ${{ matrix.state_machine_adapter }}"
17+
name: "Sylius ${{ matrix.sylius }}, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, ${{ matrix.database == 'mysql' && format('MySQL {0}', matrix.mysql) || matrix.database == 'postgres' && format('PostgreSQL {0}', matrix.postgres) }}, State Machine Adapter ${{ matrix.state_machine_adapter }}"
1818

1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
php: ["8.1", "8.2"]
23-
node: ["20.x"]
24-
mysql: ["8.0"]
22+
php: ["8.3"]
2523
symfony: ["^5.4.21", "^6.4"]
26-
sylius: ["~1.12.0", "~1.13.0"]
27-
state_machine_adapter: ["winzou_state_machine", "symfony_workflow"]
24+
sylius: ["~1.13.0", "~1.14.0"]
25+
database: ["mysql", "postgres"]
26+
mysql: ["8.4"]
27+
postgres: ["15.8"]
28+
node: ["20.x"]
29+
state_machine_adapter: ["symfony_workflow"]
2830

2931
include:
30-
- php: "8.3"
32+
-
33+
php: "8.1"
34+
symfony: "^6.4"
35+
sylius: "~1.14.0"
36+
database: "mysql"
37+
mysql: "8.4"
3138
node: "20.x"
32-
mysql: "8.0"
39+
wkhtmltopdf: "0.12.6-1"
40+
state_machine_adapter: "symfony_workflow"
41+
-
42+
php: "8.2"
3343
symfony: "^6.4"
34-
sylius: "~1.13.0"
44+
sylius: "~1.14.0"
45+
database: "mysql"
46+
mysql: "8.4"
47+
node: "20.x"
48+
wkhtmltopdf: "0.12.6-1"
49+
state_machine_adapter: "winzou_state_machine"
50+
-
51+
php: "8.2"
52+
symfony: "^6.4"
53+
sylius: "~1.14.0"
54+
database: "mysql"
55+
mysql: "8.4"
56+
node: "20.x"
57+
wkhtmltopdf: false
3558
state_machine_adapter: "symfony_workflow"
3659

37-
exclude:
38-
- sylius: "~1.12.0"
39-
state_machine_adapter: "symfony_workflow"
40-
4160
env:
4261
APP_ENV: test
43-
DATABASE_URL: "mysql://root:root@127.0.0.1/sylius?serverVersion=${{ matrix.mysql }}"
62+
DATABASE_URL: ${{ matrix.database == 'mysql' && format('mysql://root:root@127.0.0.1/sylius?serverVersion={0}', matrix.mysql) || format('pgsql://postgres:postgres@127.0.0.1/sylius?serverVersion={0}', matrix.postgres) }}
4463
TEST_SYLIUS_STATE_MACHINE_ADAPTER: "${{ matrix.state_machine_adapter }}"
4564

4665
steps:
@@ -63,16 +82,27 @@ jobs:
6382
node-version: "${{ matrix.node }}"
6483

6584
-
66-
name: Shutdown default MySQL
67-
run: sudo service mysql stop
85+
name: Shutdown default database services
86+
run: |
87+
sudo service mysql stop || true
88+
sudo service postgresql stop || true
6889
6990
-
7091
name: Setup MySQL
92+
if: matrix.database == 'mysql'
7193
uses: mirromutth/mysql-action@v1.1
7294
with:
7395
mysql version: "${{ matrix.mysql }}"
7496
mysql root password: "root"
7597

98+
-
99+
name: Setup PostgreSQL
100+
if: matrix.database == 'postgres'
101+
uses: harmon758/postgresql-action@v1
102+
with:
103+
postgresql version: "${{ matrix.postgres }}"
104+
postgresql password: "postgres"
105+
76106
-
77107
name: Run Chrome Headless
78108
run: google-chrome-stable --enable-automation --disable-background-networking --no-default-browser-check --no-first-run --disable-popup-blocking --disable-default-apps --allow-insecure-localhost --disable-translate --disable-extensions --no-sandbox --enable-features=Metal --headless --remote-debugging-port=9222 --window-size=2880,1800 --proxy-server='direct://' --proxy-bypass-list='*' http://127.0.0.1 > /dev/null 2>&1 &
@@ -176,9 +206,12 @@ jobs:
176206

177207
-
178208
name: Run analysis
179-
if: ${{ matrix.sylius != '1.13.x-dev' }}
180209
run: composer analyse
181210

211+
-
212+
name: Run PHPStan
213+
run: vendor/bin/phpstan analyse -c phpstan.neon.dist src/
214+
182215
-
183216
name: Run PHPSpec
184217
run: vendor/bin/phpspec run --ansi -f progress --no-interaction

.github/workflows/upmerge_pr.yaml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: Upmerge PR
2+
3+
on:
4+
schedule:
5+
-
6+
cron: "0 2 * * *"
7+
workflow_dispatch: ~
8+
9+
permissions:
10+
contents: write
11+
pull-requests: write
12+
13+
jobs:
14+
upmerge:
15+
runs-on: ubuntu-latest
16+
if: github.repository == 'Sylius/PayPalPlugin'
17+
name: "Upmerge PR"
18+
timeout-minutes: 5
19+
strategy:
20+
fail-fast: false
21+
matrix:
22+
include:
23+
-
24+
base_branch: "1.7"
25+
target_branch: "2.0"
26+
27+
steps:
28+
-
29+
uses: actions/checkout@v4
30+
with:
31+
ref: ${{ matrix.target_branch }}
32+
33+
-
34+
name: Reset upmerge branch
35+
run: |
36+
git fetch origin ${{ matrix.base_branch }}:${{ matrix.base_branch }}
37+
git reset --hard ${{ matrix.base_branch }}
38+
39+
-
40+
name: Create Pull Request
41+
uses: peter-evans/create-pull-request@v4
42+
with:
43+
token: ${{ secrets.SYLIUS_BOT_PAT }}
44+
title: '[UPMERGE] ${{ matrix.base_branch }} -> ${{ matrix.target_branch }}'
45+
body: |
46+
This PR has been generated automatically.
47+
For more details see [upmerge_pr.yaml](/Sylius/PayPalPlugin/blob/1.7/.github/workflows/upmerge_pr.yaml).
48+
49+
**Remember!** The upmerge should always be merged with using `Merge pull request` button.
50+
51+
In case of conflicts, please resolve them manually with usign the following commands:
52+
```
53+
git fetch upstream
54+
gh pr checkout <this-pr-number>
55+
git merge upstream/${{ matrix.target_branch }} -m "Resolve conflicts between ${{ matrix.base_branch }} and ${{ matrix.target_branch }}"
56+
```
57+
58+
If you use other name for the upstream remote, please replace `upstream` with the name of your remote pointing to the `Sylius/PayPalPlugin` repository.
59+
60+
Once the conflicts are resolved, please run `git merge --continue` and push the changes to this PR.
61+
branch: "upmerge/${{ matrix.base_branch }}_${{ matrix.target_branch }}"
62+
delete-branch: true
63+
base: ${{ matrix.target_branch }}

CONFLICTS.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

LICENSE

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Copyright (c) 2020-present Sylius Sp. z o.o.
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy
4+
of this software and associated documentation files (the "Software"), to deal
5+
in the Software without restriction, including without limitation the rights
6+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
copies of the Software, and to permit persons to whom the Software is furnished
8+
to do so, subject to the following conditions:
9+
10+
The above copyright notice and this permission notice shall be included in all
11+
copies or substantial portions of the Software.
12+
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19+
THE SOFTWARE.

LICENSE_OF_TRADEMARK_AND_LOGO

Lines changed: 162 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
Encourage widespread and fair use of Sylius logo and brand identity.
2+
3+
This Trademarks and Logos use policy (the “Policy”) is based on the Ubuntu
4+
and Symfony trademark policy and published under the CC-BY-SA license. You
5+
are welcome to base your own project trademark policies off it, just let
6+
others use your changes and give credit to the Ubuntu and Symfony projects
7+
as the original source!
8+
9+
Version n°1. Published on April 5th 2019.
10+
11+
The objective of the Policy is to encourage widespread use of the Sylius
12+
trademarks by the Sylius community while controlling that use in order to
13+
avoid confusion on the part of Sylius users and the general public, to
14+
maintain the value of the image and reputation of the trademarks and to
15+
protect them from inappropriate or unauthorised use.
16+
17+
The sections below describe what is allowed, what isn’t allowed, and cases
18+
in which you should ask permission.
19+
If you have any doubt, please contact us and a member of our legal
20+
representative will be in touch with you shortly.
21+
If you are aware a breach or misuse of the Sylius trademarks in any
22+
way, we would appreciate you bringing this to our attention. Please
23+
contact us so that we can investigate this further.
24+
25+
The Trademarks and Logos
26+
Sylius sp. z o.o. owns the verbal trademark containing
27+
in whole or part of the word “Sylius”.
28+
29+
Any verbal mark starting with the letters “Sylius” is sufficiently
30+
similar to one or more of the trademarks that permission will be
31+
needed in order to use it.
32+
33+
All verbal trademarks of Sylius sp. z o.o., all distinctive signs used in
34+
commerce by Sylius sp. z o.o. to designate his products or services related
35+
to Sylius are collectively referred to as the “Trademarks”.
36+
37+
Permitted use of the Trademarks
38+
Certain usages of the Trademarks are fine and no specific permission
39+
from us is needed.
40+
41+
Community advocacy. Sylius is built by its community. We share access to
42+
the Trademarks with the entire community for the purposes of discussion,
43+
development and advocacy. We recognise that most of the open source discussion
44+
and development areas are for non-commercial purposes and will allow the
45+
use of the Trademarks in this context, provided:
46+
47+
the Trademark is used in a manner consistent with this Policy;
48+
there is no commercial intent behind the use;
49+
what you are referring to is in fact Sylius. If someone is confused into
50+
thinking that what isn’t Sylius is, in fact, Sylius, you are probably doing
51+
something wrong;
52+
there is no suggestion (through words or appearance) that your project is
53+
approved, sponsored, or affiliated with Sylius, Sylius sp. z o.o. or its
54+
related projects unless it actually has been approved by and is accountable
55+
to Sylius sp. z o.o. and the Sylius Project.
56+
Building on Sylius or for Sylius. If you are producing new software which is
57+
intended for use with or on Sylius, you may use the Trademark in a way which
58+
indicates the intent of your product. For example, if you are developing a
59+
system management tool for Sylius, acceptable project titles would be
60+
“System Management for Sylius” or “Sylius Based Systems Management”. We would
61+
strongly discourage, and likely would consider to be problematic, a name such
62+
as SyliusMan, Sylius Management, etc. Furthermore, you may not use the
63+
Trademarks in a way which implies an endorsement where that doesn’t exist,
64+
or which attempts to unfairly or confusingly capitalise on the goodwill
65+
or brand of the project.
66+
67+
Commentary and parody. The Trademarks and Logos are designed to cover use of
68+
a mark to imply origin or endorsement by the project. When a user downloads
69+
something called Sylius, they should know it comes from the Sylius project.
70+
This helps Sylius build a reputation that will not be damaged by confusion
71+
around what is, and isn’t, Sylius. Using the Trademarks in your discussion,
72+
commentary, criticism or parody, in ways that unequivocally do not imply
73+
endorsement, is permissible. Anyone is free to write articles, create
74+
websites, blog about, or talk about Sylius — as long as it’s clear to
75+
everyone — including people completely unfamiliar with Sylius — that they
76+
are simply referring to Sylius and in no way speaking for the Sylius
77+
project and/or for Sylius sp. z o.o.
78+
79+
We reserve the right to review all usage within the open source community,
80+
and to object to any usage that appears to overstep the bounds of discussion
81+
and good-faith non-commercial development. In any event, once a project has
82+
left the open source project phase or otherwise become a commercial project,
83+
this Policy does not authorise any use of the Trademarks in connection to
84+
that project.
85+
86+
Restricted use that requires a trademark licence
87+
Permission from us is necessary to use any of the Trademarks under any
88+
circumstances other than those specifically permitted above.
89+
90+
These include but are not limited to:
91+
92+
Any commercial use including for any services related to Sylius such as
93+
providing training services, conference services, or design services (should
94+
you wish to provide such services, please contact us beforehand to explore
95+
Sylius Solution Partner Program);
96+
Use on or in relation to a software product that includes or is built on top
97+
of a product supplied by us, if there is any commercial intent associated
98+
with that product;
99+
Use in a domain name or URL;
100+
Use for merchandising purposes, e.g. on t-shirts and the like.
101+
If you wish to have permission for any of the uses above or for any other use
102+
which is not specifically referred to in this Policy, please contact us and
103+
we’ll let you know as soon as possible if your proposed use is permissible.
104+
Permission may only be granted subject to certain conditions and these may
105+
include the requirement that you enter into an agreement with us to maintain
106+
the quality of the product and/or service which you intend to supply at a
107+
prescribed level.
108+
109+
While there may be exceptions, it is very unlikely that we will approve
110+
Trademark use in the following cases:
111+
112+
Use of a Trademark in a company name;
113+
Use of a Trademark in a domain name which has a commercial intent. The
114+
commercial intent can range from promotion of a company or product, to
115+
collecting revenue generated by advertising;
116+
The calling of any software or product by the name Sylius (or another
117+
related Trademark);
118+
Use in combination with any other marks or logos. This include use of
119+
a Trademark in a manner that creates a “combined mark,” or use that
120+
integrates other wording with the Trademark in a way that the public may
121+
think of the use as a new mark (for example Club Sylius or SyliusBooks, or
122+
in a way that by use of special fonts or presentation with nearby words or
123+
images conveys an impression that the two are tied in some way);
124+
Use in combination with any product or service which is presented as being
125+
Certified or Official or formally associated with us or our products or
126+
services;
127+
Use in a way which implies an endorsement where that doesn’t exist, or which
128+
attempts to unfairly or confusingly capitalise on the goodwill or brand of
129+
the project;
130+
Use of a Trademark in a manner that disparages Sylius, or Sylius sp. z o.o.;
131+
or its products and is not clearly third-party parody;
132+
Use of a Trademark on or in relation to a software product which constitutes
133+
a substantially modified version of a product supplied by the Sylius project,
134+
that is to say with material changes to the code, or services relating to
135+
such a product; and
136+
Use of a Trademark in a title or metatag of a web page whose sole intention or
137+
result is to influence search engine rankings or result listings (for example
138+
use as keyword for advertising purposes), rather than for discussion,
139+
development or advocacy of the Trademarks.
140+
Logo usage guidelines
141+
Except otherwise agreed, any use of Logos shall be expressly authorized by
142+
writing by Sylius sp. z o.o.. To get any authorization to use any Logo,
143+
please contact us and a member of our team will be in touch with you shortly.
144+
145+
Our logos are presented in multiple colours and it is important that their
146+
visual integrity be maintained.
147+
148+
Therefore, when use of Logos is authorized, it is therefore preferable that
149+
the logos only be used in their standard form but if you should feel the need
150+
to alter them in any way you should keep the following guidelines in mind.
151+
152+
It should also be borne in mind that the more you wish to vary our logos
153+
from their standard form the smaller is the chance that we will be able to
154+
approve your proposed use.
155+
156+
If presented in multiple colours, the logo should only use the “official”
157+
logo colours.
158+
You may use transparency and gradient/depth tools but should retain the
159+
“official” colours.
160+
Any scaling must retain the original proportions of the logo.
161+
In case of non-compliance with Trademarks and Logos’ Use Policy or
162+
applicable law, any use of the Trademarks and/or Logos will be prohibited.

0 commit comments

Comments
 (0)