Skip to content

Commit

Permalink
WIP refactor for PSR-7
Browse files Browse the repository at this point in the history
  • Loading branch information
mtdowling committed Feb 25, 2015
1 parent 646ca53 commit 1a9ad6b
Show file tree
Hide file tree
Showing 134 changed files with 4,058 additions and 12,809 deletions.
23 changes: 8 additions & 15 deletions Makefile
Original file line number Original file line Diff line number Diff line change
@@ -1,10 +1,14 @@
all: clean coverage docs all: clean coverage docs


start-server: start-server: stop-server
cd vendor/guzzlehttp/ringphp && make start-server node tests/server.js &> /dev/null &


stop-server: stop-server:
cd vendor/guzzlehttp/ringphp && make stop-server @PID=$(shell ps axo pid,command \
| grep 'tests/server.js' \
| grep -v grep \
| cut -f 1 -d " "\
) && [ -n "$$PID" ] && kill $$PID || true


test: start-server test: start-server
vendor/bin/phpunit vendor/bin/phpunit
Expand Down Expand Up @@ -36,15 +40,4 @@ tag:
git commit -m '$(TAG) release' git commit -m '$(TAG) release'
chag tag chag tag


perf: start-server .PHONY: docs
php tests/perf.php
$(MAKE) stop-server

package: burgomaster
php build/packager.php

burgomaster:
mkdir -p build/artifacts
curl -s https://raw.githubusercontent.com/mtdowling/Burgomaster/0.0.2/src/Burgomaster.php > build/artifacts/Burgomaster.php

.PHONY: docs burgomaster
12 changes: 8 additions & 4 deletions composer.json
Original file line number Original file line Diff line number Diff line change
@@ -1,7 +1,7 @@
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
"type": "library", "type": "library",
"description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients", "description": "Guzzle is a PHP HTTP client library",
"keywords": ["framework", "http", "rest", "web service", "curl", "client", "HTTP client"], "keywords": ["framework", "http", "rest", "web service", "curl", "client", "HTTP client"],
"homepage": "http://guzzlephp.org/", "homepage": "http://guzzlephp.org/",
"license": "MIT", "license": "MIT",
Expand All @@ -14,7 +14,9 @@
], ],
"require": { "require": {
"php": ">=5.4.0", "php": ">=5.4.0",
"guzzlehttp/ringphp": "~1.0" "psr/http-message": "^0.9",
"guzzlehttp/psr7": "dev-master",
"guzzlehttp/promises": "dev-master"
}, },
"require-dev": { "require-dev": {
"ext-curl": "*", "ext-curl": "*",
Expand All @@ -24,7 +26,8 @@
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"GuzzleHttp\\": "src/" "GuzzleHttp\\": "src/"
} },
"files": ["src/functions.php"]
}, },
"autoload-dev": { "autoload-dev": {
"psr-4": { "psr-4": {
Expand All @@ -33,7 +36,8 @@
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "5.0-dev" "dev-master": "5.0-dev",
"dev-6": "6.0-dev"
} }
} }
} }
148 changes: 0 additions & 148 deletions src/BatchResults.php

This file was deleted.

1 comment on commit 1a9ad6b

@fideloper
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In memoriam of json

image

Please sign in to comment.