Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix static tests forPHP 7.4 #1058

Merged
merged 1 commit into from
Jun 24, 2020
Merged

Fix static tests forPHP 7.4 #1058

merged 1 commit into from
Jun 24, 2020

Conversation

szymonbdeligo
Copy link

No description provided.

@tmotyl
Copy link
Contributor

tmotyl commented Jun 23, 2020

Isnt there already a mr for this https://github.com/OpenMage/magento-lts/pull/1047/files ?
Lets review one and get merged

@sreichel
Copy link
Contributor

sreichel commented Jun 23, 2020 •
edited
Loading

It looks like a dupe of #1047 ;)

(OT ...why i am able to merge this w/o reviews?)

@sreichel sreichel closed this Jun 23, 2020
@sreichel sreichel added duplicate PHP 7.x Related to PHP 7.x labels Jun 23, 2020
@szymonbdeligo
Copy link
Author

It was not a duplicate because it was not merged to branch 1.9.4.x. This commit was a part of work on branch functional-test-suite

@sreichel
Copy link
Contributor

The fixes are the same, but I'd prefer this one .... i have change made that was not necessary.

@sreichel sreichel reopened this Jun 24, 2020
@sreichel sreichel mentioned this pull request Jun 24, 2020
Closed
@colinmollenhour colinmollenhour merged commit 24e1d5c into OpenMage:functional-test-suite Jun 24, 2020
@sreichel sreichel added this to the PHP 7.4 milestone Jun 24, 2020
@sreichel sreichel added Component: Eav Relates to Mage_Eav Component: lib/* Relates to lib/* labels Jun 25, 2020
@sreichel sreichel modified the milestones: PHP 7.4, Release 19.4.6 Jun 27, 2020
colinmollenhour added a commit that referenced this pull request Apr 4, 2023
@colinmollenhour
Squashed commit of the following:
b5df99e 
commit 974fb37
Author: Mohamed ELIDRISSI <67818913+elidrissidev@users.noreply.github.com>
Date:   Fri Mar 10 10:15:57 2023 +0100

    Remove `chroot` and `chdir` completely

commit ded6e16
Author: Mohamed ELIDRISSI <67818913+elidrissidev@users.noreply.github.com>
Date:   Fri Mar 10 10:13:08 2023 +0100

    Comment out `chroot` and `chdir`

commit 6fd3aba
Author: Sven Reichel <github-sr@hotmail.com>
Date:   Sun Jan 15 02:39:27 2023 +0100

    Test No3

commit 943f5c2
Author: Sven Reichel <github-sr@hotmail.com>
Date:   Sun Jan 15 02:19:36 2023 +0100

    Test No2

commit acf73d7
Author: Sven Reichel <github-sr@hotmail.com>
Date:   Sun Jan 15 01:53:48 2023 +0100

    Test

commit f77300c
Author: Mohamed ELIDRISSI <67818913+elidrissidev@users.noreply.github.com>
Date:   Wed Jan 11 11:50:43 2023 +0100

    Remove ProxyPassMatch from apache site

    Should fallback to php7.3-fpm.conf since it's enabled AFAIK

commit d633e04
Author: Colin Mollenhour <colin@mollenhour.com>
Date:   Wed Jan 11 01:07:57 2023 -0500

    Troubleshooting Selenium/Apache

commit 59d6343
Author: Colin Mollenhour <colin@mollenhour.com>
Date:   Wed Jan 11 01:02:03 2023 -0500

    Troubleshooting Selenium/Apache

commit df8f211
Author: Colin Mollenhour <colin@mollenhour.com>
Date:   Tue Jan 10 18:27:56 2023 -0500

    Migrate MTF from Travis to Github Actions. First attempt.

commit 46e5c36
Merge: b0acd23 bd0cb12
Author: Colin Mollenhour <colin@mollenhour.com>
Date:   Tue Jan 10 16:55:59 2023 -0500

    Merge remote-tracking branch 'openmage/1.9.4.x' into functional-test-suite

commit b0acd23
Author: akrzemianowski <44834491+akrzemianowski@users.noreply.github.com>
Date:   Mon Jun 29 16:11:44 2020 +0200

    Fixed issue with admin login after forced password rehash (#1071)

commit 24e1d5c
Author: szymonbdeligo <62687886+szymonbdeligo@users.noreply.github.com>
Date:   Thu Jun 25 00:40:51 2020 +0200

    Fix static tests forPHP 7.4 (#1058)

commit 08c79ad
Author: Colin Mollenhour <colin@mollenhour.com>
Date:   Mon Jun 22 00:57:39 2020 -0400

    Fix install command to use same password as mtf.

commit 58ff3c6
Author: Colin Mollenhour <colin@mollenhour.com>
Date:   Sun Jun 21 20:44:13 2020 -0400

    Add travis timeout for 30 minutes as per @szymonbdeligo.

commit e544ea9
Author: Tymoteusz Motylewski <t.motylewski@gmail.com>
Date:   Mon May 18 22:49:23 2020 +0200

    Make script files executable

commit 17a4131
Author: Colin Mollenhour <colin@mollenhour.com>
Date:   Tue May 5 18:14:12 2020 -0400

    Add script for running MTF locally via Docker.

commit 8219636
Author: Colin Mollenhour <colin@mollenhour.com>
Date:   Tue May 5 17:03:45 2020 -0400

    Remove DownloaderPart2Test and DownloaderTest as they do not run and we do not support downloader.

commit 4620035
Author: Colin Mollenhour <colin@mollenhour.com>
Date:   Tue May 5 15:17:47 2020 -0400

    Fix Composer install for PHP 7.4

commit 2aed58c
Author: Colin Mollenhour <colin@mollenhour.com>
Date:   Tue May 5 15:13:59 2020 -0400

    Generate tests and remove filter.

commit 8ff94e7
Author: Colin Mollenhour <colin@mollenhour.com>
Date:   Tue May 5 14:35:23 2020 -0400

    Try to reconcile magento/mtf updates and PHPUnit updates.

commit 6eee8a0
Author: Colin Mollenhour <colin@mollenhour.com>
Date:   Tue May 5 12:56:59 2020 -0400

    Disable `mtf troubleshooting:check-all` command as it appears to only fork for Magento 2

commit 50b837e
Author: Colin Mollenhour <colin@mollenhour.com>
Date:   Mon May 4 20:13:41 2020 -0400

    Try updating PHPUnit dependencies. May require PHPUnit 8.

commit 2deb37d
Author: Colin Mollenhour <colin@mollenhour.com>
Date:   Mon May 4 20:02:20 2020 -0400

    Trying Magento MTF rc64.

commit 6ac2ed3
Author: Colin Mollenhour <colin@mollenhour.com>
Date:   Mon May 4 19:12:08 2020 -0400

    Add back troubleshooting:check-all step.

commit 5095481
Author: Colin Mollenhour <colin@mollenhour.com>
Date:   Mon May 4 19:08:10 2020 -0400

    Add missing travis_acceptance.xml

commit a0f4b10
Author: Colin Mollenhour <colin@mollenhour.com>
Date:   Mon May 4 18:51:56 2020 -0400

    Fix before_script.sh for functional test. Skip composer install for static test.

commit b9134fe
Author: Colin Mollenhour <colin@mollenhour.com>
Date:   Mon May 4 18:37:24 2020 -0400

    Fix invalid password for admin, remove unneeded static test steps.

commit 01e04da
Author: Colin Mollenhour <colin@mollenhour.com>
Date:   Mon May 4 18:23:58 2020 -0400

    Fix Magento install.

commit 30564cc
Author: Colin Mollenhour <colin@mollenhour.com>
Date:   Mon May 4 18:09:32 2020 -0400

    Shell scriupts must be executable.

commit c57d92c
Author: Colin Mollenhour <colin@mollenhour.com>
Date:   Mon May 4 18:04:19 2020 -0400

    First attempt to get functional tests working using magento2 travis files.

Conflicts:
	dev/tests/functional/lib/Magento/Mtf/App/State/AbstractState.php
	dev/tests/functional/lib/Magento/Mtf/App/State/State1.php
	dev/tests/functional/lib/Magento/Mtf/Client/Driver/Selenium/Driver.php
	dev/tests/functional/lib/Magento/Mtf/Client/Element/SimpleElement.php
	dev/tests/functional/lib/Magento/Mtf/Util/Generate/Page.php
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@colinmollenhour colinmollenhour colinmollenhour approved these changes

Assignees
No one assigned
Labels
Component: Eav Relates to Mage_Eav Component: lib/* Relates to lib/* PHP 7.x Related to PHP 7.x
Projects
None yet
Milestone
Release 19.4.4 / 20.0.0
Development

Successfully merging this pull request may close these issues.
4 participants
@szymonbdeligo @tmotyl @sreichel @colinmollenhour