Reverting part of Jitm package to use global Jetpack class #12629

gititon · 2019-06-07T21:58:16Z

Reverting part of Jitm package to use \Jetapck since functions not yet available in Connection package.

Previous PR: #12516

Testing instructions:

Apply D29283-code to your WPCOM sandbox to ensure there is always a JITM waiting for you. Confirm that you see the Jitm when you visit the list of plugins (you should see a JITM that says "Hi").

Update the return value of is_active() in class.jetpack.php (line 1564) so that it always returns false. This will cause the jetpack_just_in_time_messages filter to return false,

dd_filter( 'jetpack_just_in_time_msgs', function( $display ) {
			if ( ! \Jetpack::is_active() || \Jetpack::is_development_mode() ) {
				return false;
			}
            return true;
		}, 9 );

When you reload the page, the JITM will not appear until you remove the return statement from is_active().

…ailable yet in Connection package

jetpackbot · 2019-06-07T22:03:47Z

	Warnings
⚠️	"Proposed changelog entry" is missing for this PR. Please include any meaningful changes

This is an automated check which relies on PULL_REQUEST_TEMPLATE. We encourage you to follow that template as it helps Jetpack maintainers do their job. If you think 'Testing instructions' or 'Proposed changelog entry' are not needed for your PR - please explain why you think so. Thanks for cooperation 🤖

Generated by 🚫 dangerJS against 1aaa825

gititon · 2019-06-10T18:10:52Z

class.jetpack.php

+			if ( ! \Jetpack::is_active() || \Jetpack::is_development_mode() ) {
+				return false;
+			}
+            return true;


Don't we want to return $display if we don't return false in case some other callback added to the filter is making it return false?

it was returningtrue before 🤷‍♀️

lezama · 2019-06-10T20:40:58Z

class.jetpack.php


 		// A filter to control all just in time messages
-		add_filter( 'jetpack_just_in_time_msgs', '__return_true', 9 );
+		add_filter( 'jetpack_just_in_time_msgs', function( $display ) {


Anonymous functions must not be passed as filter or action callbacks

@enejb

* Add Custom Autoloader (#12447) * Try Custom Autoloader * spelling fix Co-Authored-By: Marin Atanasov <[email protected]> * minor space fix Co-Authored-By: Marin Atanasov <[email protected]> * minor space fix. Co-Authored-By: Marin Atanasov <[email protected]> * Updated to make it even simpler * test plugin * a Toy plugin :) 🚂 * Minor update * Minor update * Fixes typo * delete file * Minor updates * Added limitaionts section to readme * ooops * Fix readme * Turn the jetpack-autoloader into a package. * fixes to the jetpack a custom plugin * typo Co-Authored-By: Marin Atanasov <[email protected]> * remove scripts to "a" no longer needed thanks to @enejb magic * Update packages/autoloader/README.md fixes more wording in the readme Co-Authored-By: Miguel Lezama <[email protected]> * Update the version numbers of packages insead of branches * forgot about the plugin * update "a" composer * Update the a composer lock file. * Revert "Update the a composer lock file." This reverts commit 90f2cb8dbc50e15caf19fa0b88e1ee201f8f21c5. * typo fix Co-Authored-By: Miguel Lezama <[email protected]> * Rebased against master, testes that a plugin works as expected * Remove not needed code * Minor readme fix * Remoce Space * Add filter to prevent the autoloader from loading a particular version * add b toy plugin depending on Jetpack Logo 1.0.1 Co-Authored-By: Marin Atanasov <[email protected]> * minor space fix Co-Authored-By: Miguel Lezama <[email protected]> * Update a comment * Fix phpcs fixes * Make the remove class_map from the global name space, fix phpcs issues * Add the autoload_packages to be ignored. * Add debug info * Remove versions from composer.json of packages * Add missing vendor to namespace * Fix typo * Fix typo and add punctuation * Fix a typo * Update .gitignore Co-Authored-By: Jeremy Herve <[email protected]> * Update all the composer files * Take into account the @dev and always use the dev-* version * Bug Fix load the latest version! * Update the logic when enqueing the classes * Update to use Namespaces * Add tests to make sure that the enqueing works as expected * Fix suggestions from Marin * Remove generateClassMap method * Fix the tests, rename the fucntion name to be more accurate * More fixes to the tests. * FuN * Making it all work again * Update the lock file * Minor * Remove unused plugins (#12529) * Removed unnecessary gitignore lines. * Separate the connection library into its own package. (#12399) * Added an interface as a guide for the new package methods. * Add package structure * Initialized the composer library, added gitignore. * Removed phpunit from connection dependencies. * Added first real code to the connection manager class, as well as tests for it. * Renamed the test folder to tests. * Made the option name be a class constant. * Added 10up's WP_Mock as a dependency, refactored the injection to use filters instead of setters. * Changed the internal method accessibility to protected. * Initialized an empty package repo for the options manager. * Added the options package as a dependency to the master repo. * Added a package structure placeholder for the options manager. * Added the first test for the delete option method. * Added the update method and a test for it. * Added a test for the grouped option deletion. * Added the group updater method and a test for it. * Added the grouped option getter and a test for it. * Added a test for the noncompact option getter. * Added tests for network option manipulation. * Removed autoloader requirement in favour of the existing one. * Added the connection manager secret generator to actual Jetpack class. * Removed individual gitignore files in favor of a parent-level file, props @tyxla! * Moved packages source code into src folders. * Removed the V7 part of the namespace. * Remove v7 from namespace in the Manager Interface * Remove V7 from namespaces * Add Automattic to the namespace * Rename jetpack-[name] packages to [name] * Update composer lock * Adding a package for Jetpack Constants * Attempting to fix WPCOM tests. * Excluding packages folder from linting for PHP 5.6 and earlier. * adjust syntax in connection tests * removing new unit tests. i'm not sure why they are failing. we can re-add them later. * reverting last commit, and fixing tests in `packages/options` * ah, one more * remove an un-needed linting hack (#12543) * Composer: avoid duplicate repositories key (#12546) * Composer: avoid duplicate repositories key Rely on wildcard instead. See #12483 * Revert changes in composer.lock * Revert changes in composer.lock * Revert changes in composer.lock * Packages: Make logo package tests independent (#12514) * Move package tests to package directory * Add some dev deps to logo package * Ignore vendor of all packages * Add a logo package simple bootstrap * Add a logo package phpunit config * Cleanup package tests from Jetpack phpunit config * Remove WP prefix from class name * Make sure composer is installed * Try: add SCOPE to travis matrix * Try: Disable older PHP versions * Replace WP_Mock with PHPMock * Enable php 7.0 in Travis again * Make phpunit version more permissive * Fix setUp signature * Play with phpunit versions * Try enabling CI for feature branch * Try enabling CI for feature branch * Try enabling CI for feature branch * Revert latest changes * Try adding the branch to the whitelist * Enable PHP 5.6 again * Use php-mock instead of php-mock-phpunit * Run composer phpunit for all packages * Make mocking method protected * Add parent teardown * Remove whitelisted branch * Run only for packages with tests * remove trailing slash 🤔 * nope * not sure what I am doing * add debug statements * run only if we have `php` tests @zinigor @tyxla we need to normalise de connection one * Jetpack Options Package: just class map existing options class (#12562) * instead of a new implementation of jetpack options, let's class map it * Packages: Fix connection tests and allow them to run in CI (#12560) * Use php-mock instead of wp_mock * Add phpunit script * Migrate tests from wp_mock to phpmock * Make tests run in CI * Run travis only for packages that have the php test dir * Revert "Jetpack Options Package: just class map existing options class (#12562)" (#12571) This reverts commit 0e3ac7a. * Packages: Finish the constants package (#12558) * PSR-4 constants * Actually add namespacing to the constants class * Update composer.lock * Fix phpcs errors and add some docs * Add a package README * Move constant tests to the package * Update Jetpack to use the constants package * Fix constants usage in options package * Rename README variable Co-Authored-By: Miguel Lezama <[email protected]> * Fix typo Co-Authored-By: Miguel Lezama <[email protected]> * Use plural Co-Authored-By: Miguel Lezama <[email protected]> * Making Jetpack_Options a classmapped package. (#12577) * Making Jetpack_Options a classmapped package. * Update Jetpack to use new JITM package (#12516) * Update Jetpack to use new JITM package * Add instructions on package installation and usage (#12576) * Add instructions on package installation and usage * Move content about installing Composer to the doc regarding development environment. Add a pointer to that section in the packages' readme * Explain how to install Composer on systems other than macOS. Props @aldavigdis * Update docs/development-environment.md Co-Authored-By: Jeremy Herve <[email protected]> * Apply suggestions from code review Co-Authored-By: Jeremy Herve <[email protected]> * Add reference to Composer installation in the section that explains how to start developing for Jetpack * Packages: Fix alias example in README (#12582) * Packages: Move sync to a classmapped package (#12572) * Move all sync files to the package * Add sync package composer.json * Composer require the new sync package * Update composer.lock after adding sync package dependency * Remove some sync file requiring in sync package * Remove some sync file requiring in the rest of Jetpack * Hook Jetpack actions properly * Fix a rebase conflict * Fix update post terms test to not compare against the DB * Packages: Move JITM tests to package and fix deps (#12583) * Add phpunit devdep and composer phpunit script * Add JITM tests config * Move tests and add bootstrap * Remove legacy jitm suite * Rely on @dev connection package * Remove version * Update minimum stability and prefer stable * Fix tests * Update composer.lock * Fix whitespace Co-Authored-By: Miguel Lezama <[email protected]> * Prepend an empty line Co-Authored-By: Miguel Lezama <[email protected]> * Connection Package: add Jetpack_Data methods (#12580) Jetpack_Data -> Connection package * removes php_bug_66229_check method - it's no longer used in the code base. * Moving is_usable_domain to Connection package. * Moves `get_access_token` to Connection package. * Create package for Jetpack Tracking (#12596) Created package for Jetpack Tracking * Update/package logo add gray (#12610) * Update the logo package to include a gray version. Add parameter to render method to specify the type * Remove svg files. Update method to return an SVG string that can be stylized with CSS. Update tests. * Fixed issue with logo in Jetpack connection banner in WP Admin * Update test so it strictly tests two instances of the CSS class * Optimize performance. Use const since the string is immutable. Use nowdoc to compose the string. * Update logo tests in new file * Constants_Manager -> Constants * inc/lib/admin-pages/class.jetpack-react-page.php (#12627) * Add jetpack signature class to connection package (#12620) * Connection package: Add class.jetpack-signature and class.jetpack-error to connection package * DNA: Don't require composer autoloader (#12624) * Jitm package, don't use global Jetpack class (#12629)

@enejb

* Add Custom Autoloader (#12447) * Try Custom Autoloader * spelling fix Co-Authored-By: Marin Atanasov <[email protected]> * minor space fix Co-Authored-By: Marin Atanasov <[email protected]> * minor space fix. Co-Authored-By: Marin Atanasov <[email protected]> * Updated to make it even simpler * test plugin * a Toy plugin :) 🚂 * Minor update * Minor update * Fixes typo * delete file * Minor updates * Added limitaionts section to readme * ooops * Fix readme * Turn the jetpack-autoloader into a package. * fixes to the jetpack a custom plugin * typo Co-Authored-By: Marin Atanasov <[email protected]> * remove scripts to "a" no longer needed thanks to @enejb magic * Update packages/autoloader/README.md fixes more wording in the readme Co-Authored-By: Miguel Lezama <[email protected]> * Update the version numbers of packages insead of branches * forgot about the plugin * update "a" composer * Update the a composer lock file. * Revert "Update the a composer lock file." This reverts commit 90f2cb8dbc50e15caf19fa0b88e1ee201f8f21c5. * typo fix Co-Authored-By: Miguel Lezama <[email protected]> * Rebased against master, testes that a plugin works as expected * Remove not needed code * Minor readme fix * Remoce Space * Add filter to prevent the autoloader from loading a particular version * add b toy plugin depending on Jetpack Logo 1.0.1 Co-Authored-By: Marin Atanasov <[email protected]> * minor space fix Co-Authored-By: Miguel Lezama <[email protected]> * Update a comment * Fix phpcs fixes * Make the remove class_map from the global name space, fix phpcs issues * Add the autoload_packages to be ignored. * Add debug info * Remove versions from composer.json of packages * Add missing vendor to namespace * Fix typo * Fix typo and add punctuation * Fix a typo * Update .gitignore Co-Authored-By: Jeremy Herve <[email protected]> * Update all the composer files * Take into account the @dev and always use the dev-* version * Bug Fix load the latest version! * Update the logic when enqueing the classes * Update to use Namespaces * Add tests to make sure that the enqueing works as expected * Fix suggestions from Marin * Remove generateClassMap method * Fix the tests, rename the fucntion name to be more accurate * More fixes to the tests. * FuN * Making it all work again * Update the lock file * Minor * Remove unused plugins (#12529) * Removed unnecessary gitignore lines. * Separate the connection library into its own package. (#12399) * Added an interface as a guide for the new package methods. * Add package structure * Initialized the composer library, added gitignore. * Removed phpunit from connection dependencies. * Added first real code to the connection manager class, as well as tests for it. * Renamed the test folder to tests. * Made the option name be a class constant. * Added 10up's WP_Mock as a dependency, refactored the injection to use filters instead of setters. * Changed the internal method accessibility to protected. * Initialized an empty package repo for the options manager. * Added the options package as a dependency to the master repo. * Added a package structure placeholder for the options manager. * Added the first test for the delete option method. * Added the update method and a test for it. * Added a test for the grouped option deletion. * Added the group updater method and a test for it. * Added the grouped option getter and a test for it. * Added a test for the noncompact option getter. * Added tests for network option manipulation. * Removed autoloader requirement in favour of the existing one. * Added the connection manager secret generator to actual Jetpack class. * Removed individual gitignore files in favor of a parent-level file, props @tyxla! * Moved packages source code into src folders. * Removed the V7 part of the namespace. * Remove v7 from namespace in the Manager Interface * Remove V7 from namespaces * Add Automattic to the namespace * Rename jetpack-[name] packages to [name] * Update composer lock * Adding a package for Jetpack Constants * Attempting to fix WPCOM tests. * Excluding packages folder from linting for PHP 5.6 and earlier. * adjust syntax in connection tests * removing new unit tests. i'm not sure why they are failing. we can re-add them later. * reverting last commit, and fixing tests in `packages/options` * ah, one more * remove an un-needed linting hack (#12543) * Composer: avoid duplicate repositories key (#12546) * Composer: avoid duplicate repositories key Rely on wildcard instead. See #12483 * Revert changes in composer.lock * Revert changes in composer.lock * Revert changes in composer.lock * Packages: Make logo package tests independent (#12514) * Move package tests to package directory * Add some dev deps to logo package * Ignore vendor of all packages * Add a logo package simple bootstrap * Add a logo package phpunit config * Cleanup package tests from Jetpack phpunit config * Remove WP prefix from class name * Make sure composer is installed * Try: add SCOPE to travis matrix * Try: Disable older PHP versions * Replace WP_Mock with PHPMock * Enable php 7.0 in Travis again * Make phpunit version more permissive * Fix setUp signature * Play with phpunit versions * Try enabling CI for feature branch * Try enabling CI for feature branch * Try enabling CI for feature branch * Revert latest changes * Try adding the branch to the whitelist * Enable PHP 5.6 again * Use php-mock instead of php-mock-phpunit * Run composer phpunit for all packages * Make mocking method protected * Add parent teardown * Remove whitelisted branch * Run only for packages with tests * remove trailing slash 🤔 * nope * not sure what I am doing * add debug statements * run only if we have `php` tests @zinigor @tyxla we need to normalise de connection one * Jetpack Options Package: just class map existing options class (#12562) * instead of a new implementation of jetpack options, let's class map it * Packages: Fix connection tests and allow them to run in CI (#12560) * Use php-mock instead of wp_mock * Add phpunit script * Migrate tests from wp_mock to phpmock * Make tests run in CI * Run travis only for packages that have the php test dir * Revert "Jetpack Options Package: just class map existing options class (#12562)" (#12571) This reverts commit 0e3ac7a. * Packages: Finish the constants package (#12558) * PSR-4 constants * Actually add namespacing to the constants class * Update composer.lock * Fix phpcs errors and add some docs * Add a package README * Move constant tests to the package * Update Jetpack to use the constants package * Fix constants usage in options package * Rename README variable Co-Authored-By: Miguel Lezama <[email protected]> * Fix typo Co-Authored-By: Miguel Lezama <[email protected]> * Use plural Co-Authored-By: Miguel Lezama <[email protected]> * Making Jetpack_Options a classmapped package. (#12577) * Making Jetpack_Options a classmapped package. * Update Jetpack to use new JITM package (#12516) * Update Jetpack to use new JITM package * Add instructions on package installation and usage (#12576) * Add instructions on package installation and usage * Move content about installing Composer to the doc regarding development environment. Add a pointer to that section in the packages' readme * Explain how to install Composer on systems other than macOS. Props @aldavigdis * Update docs/development-environment.md Co-Authored-By: Jeremy Herve <[email protected]> * Apply suggestions from code review Co-Authored-By: Jeremy Herve <[email protected]> * Add reference to Composer installation in the section that explains how to start developing for Jetpack * Packages: Fix alias example in README (#12582) * Packages: Move sync to a classmapped package (#12572) * Move all sync files to the package * Add sync package composer.json * Composer require the new sync package * Update composer.lock after adding sync package dependency * Remove some sync file requiring in sync package * Remove some sync file requiring in the rest of Jetpack * Hook Jetpack actions properly * Fix a rebase conflict * Fix update post terms test to not compare against the DB * Packages: Move JITM tests to package and fix deps (#12583) * Add phpunit devdep and composer phpunit script * Add JITM tests config * Move tests and add bootstrap * Remove legacy jitm suite * Rely on @dev connection package * Remove version * Update minimum stability and prefer stable * Fix tests * Update composer.lock * Fix whitespace Co-Authored-By: Miguel Lezama <[email protected]> * Prepend an empty line Co-Authored-By: Miguel Lezama <[email protected]> * Connection Package: add Jetpack_Data methods (#12580) Jetpack_Data -> Connection package * removes php_bug_66229_check method - it's no longer used in the code base. * Moving is_usable_domain to Connection package. * Moves `get_access_token` to Connection package. * Create package for Jetpack Tracking (#12596) Created package for Jetpack Tracking * Update/package logo add gray (#12610) * Update the logo package to include a gray version. Add parameter to render method to specify the type * Remove svg files. Update method to return an SVG string that can be stylized with CSS. Update tests. * Fixed issue with logo in Jetpack connection banner in WP Admin * Update test so it strictly tests two instances of the CSS class * Optimize performance. Use const since the string is immutable. Use nowdoc to compose the string. * Update logo tests in new file * Constants_Manager -> Constants * inc/lib/admin-pages/class.jetpack-react-page.php (#12627) * Add jetpack signature class to connection package (#12620) * Connection package: Add class.jetpack-signature and class.jetpack-error to connection package * DNA: Don't require composer autoloader (#12624) * Jitm package, don't use global Jetpack class (#12629)

Reverting part of Jitm package to use \Jetapck since functions not av…

38d3fb6

…ailable yet in Connection package

gititon added the [Status] Needs Review This PR is ready for review. label Jun 7, 2019

gititon requested review from a team and lezama June 7, 2019 21:58

jeherve added the [Focus] Jetpack DNA label Jun 10, 2019

jeherve assigned gititon Jun 10, 2019

jeherve mentioned this pull request Jun 10, 2019

Feature/jetpack packages (May 31 - June 6) #12527

Merged

gititon and others added 3 commits June 10, 2019 13:54

Trying test fix

3902622

remove static init

f43d03f

Merge branch 'jitm-fix' of github.com:Automattic/jetpack into jitm-fix

111e899

gititon commented Jun 10, 2019

View reviewed changes

gititon and others added 8 commits June 10, 2019 14:27

Updating dependency

4eb5e7a

Fixing JITM tests

5c9a761

jitm add register method

5137129

cleanup

98e1d34

Adding require statement necessary when reconnecting Jetpack

c46a7f7

Merge branch 'jitm-fix' of github.com:Automattic/jetpack into jitm-fix

78e3f04

Merge branch 'feature/jetpack-packages' into jitm-fix

752e14c

return true;

d1e8f40

lezama reviewed Jun 10, 2019

View reviewed changes

gititon added 3 commits June 10, 2019 16:54

Removing anonymous filter in favor of named filter

6c6e56f

Renaming jitm callback

1aaa825

Renaming jitm callback

649c45c

lezama approved these changes Jun 10, 2019

View reviewed changes

lezama merged commit 40078a7 into feature/jetpack-packages Jun 10, 2019

matticbot added the [Status] Needs Changelog label Jun 10, 2019

lezama deleted the jitm-fix branch June 10, 2019 21:08

matticbot removed the [Status] Needs Review This PR is ready for review. label Jun 10, 2019

jeherve added this to the 7.5 milestone Jun 10, 2019

jeherve removed the [Status] Needs Changelog label Jun 10, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Reverting part of Jitm package to use global Jetpack class #12629

Reverting part of Jitm package to use global Jetpack class #12629

Uh oh!

gititon commented Jun 7, 2019 •

edited

Loading

Uh oh!

jetpackbot commented Jun 7, 2019 •

edited

Loading

Uh oh!

gititon Jun 10, 2019

Uh oh!

lezama Jun 10, 2019

Uh oh!

lezama Jun 10, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Reverting part of Jitm package to use global Jetpack class #12629

Reverting part of Jitm package to use global Jetpack class #12629

Uh oh!

Conversation

gititon commented Jun 7, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jetpackbot commented Jun 7, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gititon Jun 10, 2019

Choose a reason for hiding this comment

Uh oh!

lezama Jun 10, 2019

Choose a reason for hiding this comment

Uh oh!

lezama Jun 10, 2019

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

gititon commented Jun 7, 2019 •

edited

Loading

jetpackbot commented Jun 7, 2019 •

edited

Loading