Skip to content
This repository was archived by the owner on Mar 24, 2026. It is now read-only.

update dependencies for actix#3363

Merged
NateBrady23 merged 1 commit intoTechEmpower:masterfrom
fafhrd91:master
Mar 5, 2018
Merged

update dependencies for actix#3363
NateBrady23 merged 1 commit intoTechEmpower:masterfrom
fafhrd91:master

Conversation

@fafhrd91
Copy link
Copy Markdown
Contributor

@fafhrd91 fafhrd91 commented Mar 5, 2018

No description provided.

@fafhrd91 fafhrd91 mentioned this pull request Mar 5, 2018
12 tasks
@NateBrady23
Copy link
Copy Markdown
Member

This passes @fafhrd91 thanks. Ill merge this into the docker branch and try again

@NateBrady23 NateBrady23 merged commit 83ab3ab into TechEmpower:master Mar 5, 2018
michaelhixson pushed a commit to michaelhixson/FrameworkBenchmarks that referenced this pull request Mar 13, 2018
michaelhixson added a commit that referenced this pull request Mar 14, 2018
* Upgrade PHP Laravel framework (#3384)

* Starting fresh with a Laravel 5.6 default skeleton

* All Laravel tests implemented

* Laravel tuning:
- debug mode set to false
- disabled all middleware since they are not needed (including sessions, csrf, etc)

* Laravel tuning: added config and route caching as part of setup

* Laravel cache driver should probably be set to file

# Conflicts:
#	frameworks/PHP/laravel/composer.lock

* Upgrade PHP Lumen framework (#3390)

* Starting fresh with a Lumen 5.6 default skeleton

* Implemented all tests for Lumen (pretty much identical to Laravel using Eloquent and Blade)

# Conflicts:
#	frameworks/PHP/lumen/composer.lock

* update dependencies for actix (#3363)

* make a note about docker branch in PR template

* Remove the Onion build output (#3362)

* update Netty to version 4.1.22 (#3360)

* Minijax version 0.1.4 (#3345)

Updates:
 * Now using Undertow instead of Jetty
 * Enabled Eclipselink static weaving
 * Enabled Jackson Afterburner module
 * Added JVM performance settings to setup.sh
# Conflicts:
#	frameworks/Java/minijax/setup.sh

* PHP Composer tweaks (#3343)

* Upgrade PHP Composer setup to 1.6.3

* Per the readme.md in the language's root directory, we want to encourage composer.lock files to be commited:
- Removed composer.lock from .gitignore files
- Explicitely allow composer.lock files at the top level directory of each PHP framework so they don't need to be force added anymore

* SInce we are trying to replicate a production deploy, added the --no-dev, --no-suggest and --classmap-authoritative flags to the composer install command

* Clarifying the PHP readme.md that the composer dependency will run "composer install" automatically

* ignore /vendor for Workerman framework

* Added lock file for many PHP frameworks

* Fixed phpixie dependency issue to restore functionality + lock file (the orm's 2.*@dev tag doesn't seem to be on packagist anymore so we're fetching it from github instead)

* Updated Symfony composer.lock file and configured setup.sh to use the shared composer install script since the flags are now identical.

* Yii2 framework is now running on PHP 7, and its HHVM and dependency issues should be resolved.

* Added Zend 2 and Zend 1 composer lock files

* Hopefully fixed PHP Fuel dependency problem by bumping up to stable 1.8 release.

* update Wildfly to 12.0.0.Final (#3355)


# Conflicts:
#	frameworks/Java/wildfly-ee7/setup.sh
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants