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.

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

Update Twig to 2.14 and allow plugin robloach/component-installer #1280

Merged
merged 5 commits into from
Mar 2, 2022

Conversation

joelit
Copy link
Contributor

@joelit joelit commented Mar 2, 2022

Reasons for creating this PR

This PR incorporated the changes of previous PR 1262 to the master branch (instead of maintenance)

Link to relevant issue(s), if any

Description of the changes in this PR

The previous PR was used as is, with the exception of keeping composer.lock in .gitignore

Known problems or uncertainties in this PR

Checklist

  • phpUnit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works (if not, explain why below)
  • The PR doesn't introduce unintended code changes (e.g. empty lines or useless reindentation)

janvanmansum and others added 3 commits March 2, 2022 09:40
…dependency (#1)

* Allow plugin robloach/component-installer, because it is required by components/handlebars.js

* Adding /.idea to .gitignore so project can be edited in IntelliJ

* Removed .idea files from PR

* newline at end of .gitignore
* Allow plugin robloach/component-installer, because it is required by components/handlebars.js

* Adding /.idea to .gitignore so project can be edited in IntelliJ

* Removed .idea files from PR

* newline at end of .gitignore

* Upgraded Twig

* Added composer.lock
@codecov
Copy link

codecov bot commented Mar 2, 2022

Codecov Report

Merging #1280 (c6e113b) into master (da1716c) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #1280   +/-   ##
=========================================
  Coverage     69.36%   69.36%           
  Complexity     1649     1649           
=========================================
  Files            32       32           
  Lines          4047     4047           
=========================================
  Hits           2807     2807           
  Misses         1240     1240           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update da1716c...c6e113b. Read the comment docs.

@osma
Copy link
Member

osma commented Mar 2, 2022

Please don't add composer.lock to the repository. We can discuss this, but it has already been removed from the Skosmos codebase once, some years ago...

@osma
Copy link
Member

osma commented Mar 2, 2022

See PR #57 for previous discussion.

@sonarqubecloud
Copy link

sonarqubecloud bot commented Mar 2, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@osma osma merged commit 3a1902b into master Mar 2, 2022
@osma osma deleted the issue1261-library-update branch March 2, 2022 13:49
@osma osma changed the title Issue1262 library update Update Twig to 2.14 and allow plugin robloach/component-installer Mar 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

3 participants