Effectively using these two amazing technologies together. Joseph Maxwell shared a story of his own failure, pain points and tricks.

1. Composer and Git
Joseph Maxwell

2. > cd /var/www/site/
> git pull origin master
> composer update
> npm install
> node ./node_modules/gulp/bin/gulp.js prod

3. > cd /var/www/site/
> git pull origin master
> composer update

4. > cd /var/www/site/
> git pull origin master
> composer update
[RuntimeException]
Could not delete /var/www/site/vendor/module-name/src/
Model/FileName.php. Permission denied.

5. > cp /var/www/dev/vendor/* /var/www/site/vendor/
>

6. About me
• 4x Magento 1 Certified
• Magento 2 Certified Solution
Specialist
• Built a CI system for M2
• Building Magento for 5+ years
• Twitter: @josephmaxs

7. Basics

8. Git Composer
Project files vendor/
composer.json
composer.lock

9. What is Version Control?

10. ABC-123: shopping cart now shows
warning when item out of stock.

12. What is Composer?

13. composer.json
Versioning generalist. Created on composer init.

14. composer.lock
Auto-generated. Pinpoint specific version numbers.

15. vendor/
Where all the code lives.

16. — Kristof Ringleff (Fooman)
“I consider placing extensions under app/code in the
same category. It instantly creates technical debt
when it comes to upgrading… By the time you
upgrade, you probably don’t even know anymore
what was written.”
https://goo.gl/yKPBgc

17. –Johnny Appleseed
“Type a quote here.”
https://goo.gl/j7ziK6

18. > composer require
Add a package.

19. > composer update
Creates or overwrites composer.lock with latest versions.

20. > composer install
Installs dependencies from composer.lock

21. --prefer-source
Loads git source (if possible) for package.
stall

22. composer install
--no-dev
--no-interaction
--no-progress
--no-suggest
--prefer-dist
--optimize-autoloader
--classmap-authoritative

23. packagist.com
Faster, supported, managed package management.
Coupon code: meet-magento-nyc17

24. Composer + git usage
Getting the two to work together nicely.

25. https://getcomposer.org/
doc/
articles/
versions.md

26. Tagged a new release for Composer
and it won’t show up on Packagist?
https://goo.gl/6WhieN

27. Major.Minor.Patch
Semantic versioning.

28. magento/product-community-edition:^2.2
Loads Magento 2.2 CE, updating for minor versions and
patches (ex. 2.2.1)

29. dev-master
Bad.

30. ~2.2
Minimum version, allows last digit specified to increase.

31. 2.2.*
Wildcard. Same as previous slide.

32. >2.2
No less than the specified version. But no cap.

33. In a package’s composer.json
Don’t specify version.

34. Merges
LOCAL = current branch and the one that will contain the merged
code.
REMOTE = the branch that you are merging into LOCAL.

35. KaleidoscopeApp.com
Compares files / git merge tool

36. Self-control
Don’t over-import packages.

37. Magento Project Structure
Ways to setup your project.

38. Symlinks: A good .gitignore:
.gitignore
app/
composer.json
composer.lock
pub/
vendor/
docs/
app/
composer.json
composer.lock
pub/
vendor/
src/
app/
composer.json
composer.lock

39. Tricks
Making your life easier.

40. Tricks
Aggregate package: package just includes others.

41. Tricks
https://github.com/hirak/prestissimo

42. Tricks
Module building: create a ~/.composer/
composer.json. Symlinks in your modules.

43. {
"repositories": [
{
"type": "path",
"url": “/var/www/sites/modules/your-module-name"
}
],
"minimum-stability": "dev"
}

44. git help

45. composer list

46. composer show
Shows the versions of the installed packages.

47. composer show --tree
Tree view of all installed dependencies.

48. Git Workflows

49. Everything on master
Commit #1
Commit #2
Release

50. GitHub Flow
Commit #1
Commit #2
Release
Pull Request
master
feature

51. Git Flow
Feature commits
SUPEE-10266
Pull Request
master
develop
hotfix
feature

52. Deployments
Getting code to production.

53. https://github.com/mwr/magedeploy2
PHP-only, get’s code to production.

54. https://github.com/davidalger/capistrano-magento2
Ruby-based, get’s code to production.

55. https://github.com/SwiftOtter/MagentoCI
Bash-based, built on Jenkins, complete CI for Magento 2

56. Summary:
Git manages your project files.
Composer manages other’s project files (dependencies).
Include composer.lock in git.
Use specific version numbers in composer.
Twitter: @josephmaxs