Skip to content

Commit 2eac159

Browse files
KevinBKozanKevinBKozan
authored
Merge pull request #467 from magento-commerce/MFTF_5.0.6
Mftf 5.0.6
2 parents 7670d65 + da28def commit 2eac159

File tree

620 files changed

+1995
-1799
lines changed

Some content is hidden

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

620 files changed

+1995
-1799
lines changed

‎.github/workflows/main.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,5 +149,3 @@ jobs:
149149

150150
- name: Run tests
151151
run: bin/functional
152-
153-

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Magento Functional Testing Framework Changelog
22
================================================
33

4+
5.0.6
5+
---------
6+
### Fixes
7+
* Updated copyright check to use the new Adobe copyright.
8+
* Resolved errors caused by whitespace-only comments.
9+
* Addressed deprecation warnings from spomky-labs/otphp.
10+
411
5.0.5
512
---------
613
### Enhancements

‎bin/copyright-check‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,38 @@
11
#!/bin/bash
22

3-
# Copyright © Magento, Inc. All rights reserved.
4-
# See COPYING.txt for license details.
3+
# Copyright 2017 Adobe
4+
# All Rights Reserved.
55

66

77
FILE_EXTENSIONS='.php\|.xml\|.xsd'
88
BLOCKLIST='bin/blocklist.txt'
99
RESULT=''
1010

11+
CURRENT_YEAR=$(date +"%Y")
12+
1113
# Iterate through the list of tracked files
1214
# that have the expected extensions
1315
# that are not ignored
14-
for i in `git ls-tree --full-tree -r --name-only HEAD | grep $FILE_EXTENSIONS | grep -v -f $BLOCKLIST`
15-
do
16-
if echo `cat $i` | grep -q -v "Copyright © Magento, Inc. All rights reserved."; then
17-
# Copyright is missing
18-
RESULT+="$i\n"
16+
for i in $(git ls-tree --full-tree -r --name-only HEAD | grep $FILE_EXTENSIONS | grep -v -f $BLOCKLIST); do
17+
CONTENT=$(cat "$i")
18+
19+
# Extract year from copyright line
20+
if echo "$CONTENT" | grep -qE "Copyright [0-9]{4} Adobe"; then
21+
YEAR=$(echo "$CONTENT" | grep -oE "Copyright [0-9]{4} Adobe" | grep -oE "[0-9]{4}")
22+
23+
if [[ $YEAR -ge 2010 && $YEAR -le $CURRENT_YEAR ]]; then
24+
continue # Valid copyright
25+
else
26+
RESULT+="$i (Invalid year: $YEAR)\n"
27+
fi
28+
else
29+
RESULT+="$i (Missing copyright)\n"
1930
fi
2031
done
2132

2233
if [[ ! -z $RESULT ]]; then
23-
printf "\nTHE FOLLOWING FILES ARE MISSING THE MAGENTO COPYRIGHT:\n\n"
24-
printf " Copyright © Magento, Inc. All rights reserved.\n"
25-
printf " See COPYING.txt for license details.\n\n"
34+
printf "\nTHE FOLLOWING FILES HAVE COPYRIGHT ISSUES:\n\n"
35+
printf "Expected format: Copyright <year> Adobe (year between 2010 and $CURRENT_YEAR)\n\n"
2636
printf "$RESULT\n"
2737
exit 1
2838
fi

‎bin/phpunit-checks‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Copyright © Magento, Inc. All rights reserved.
2-
# See COPYING.txt for license details.
1+
# Copyright 2025 Adobe
2+
# All Rights Reserved.
33

44
# REMEMBER TO UPDATE THE .BAT FILE
55

‎bin/phpunit-checks.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
:: Copyright © Magento, Inc. All rights reserved.
2-
:: See COPYING.txt for license details.
1+
:: Copyright 2025 Adobe
2+
:: All Rights Reserved.
33

44
:: REMEMBER TO UPDATE THE BASH FILE
55

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/magento2-functional-testing-framework",
33
"description": "Magento2 Functional Testing Framework",
44
"type": "library",
5-
"version": "5.0.5",
5+
"version": "5.0.6",
66
"license": "AGPL-3.0",
77
"keywords": ["magento", "automation", "functional", "testing"],
88
"config": {

‎dev/tests/_bootstrap.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2017 Adobe
4+
* All Rights Reserved.
55
*/
66

77
error_reporting(~E_USER_NOTICE);

‎dev/tests/functional/standalone_bootstrap.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2018 Adobe
4+
* All Rights Reserved.
55
*/
66

77
//Do not continue running this bootstrap if PHPUnit is calling it

‎dev/tests/functional/tests/MFTF/DevDocs/ActionGroup/DeprecatedCommentActionGroup.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
3+
/**
4+
* Copyright 2020 Adobe
5+
* All Rights Reserved.
6+
*/
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">

‎dev/tests/functional/tests/MFTF/DevDocs/ActionGroup/HelperActionGroup.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
3+
/**
4+
* Copyright 2020 Adobe
5+
* All Rights Reserved.
6+
*/
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">

0 commit comments

Comments
 (0)