Skip to content

Commit

Permalink
psr-0 to psr-4, namespacing
Browse files Browse the repository at this point in the history
  • Loading branch information
Yunus Oksuz committed Nov 16, 2014
1 parent 20991b6 commit 3e4722b
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 47 deletions.
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ composer update

#### GET
```php
$cli = new \Curl\Request("http://example.org");
/** @var \Curl\Response $result */
$cli = new \Oksuz\Curl\Request("http://example.org");
/** @var \Oksuz\Curl\Response $result */
$result = $cli->result();

//echo $result->getHeader();
Expand All @@ -42,8 +42,8 @@ echo $result->getResponse();
#### POST

```php
$cli = new \Curl\Request("http://example.org")
/** @var \Curl\Response $result */
$cli = new \Oksuz\Curl\Request("http://example.org")
/** @var \Oksuz\Curl\Response $result */
$result = $cli->post(array("username" => "foo", "password" => "bar"))
->addReferer("http://www.google.com/?q=example")
->setOpt(CURLOPT_USERAGENT, "firefox/2.0.16") // you can add php's CURL_CONSTANTS
Expand All @@ -55,18 +55,18 @@ Also available put and delete method
#### Runing Multiple Curl Requests
```php
$clients = array();
$clients[] = new \Curl\Request("http://example1.org");
$clients[] = new \Curl\Request("http://example2.org");
$clients[] = new \Curl\Request("http://example3.org");
$runner = new \Curl\Runner();
/** @var Array $result contains \Curl\Response */
$clients[] = new \Oksuz\Curl\Request("http://example1.org");
$clients[] = new \Oksuz\Curl\Request("http://example2.org");
$clients[] = new \Oksuz\Curl\Request("http://example3.org");
$runner = new \Oksuz\Curl\Runner();
/** @var Array $result contains \Oksuz\Curl\Response */
$result = $runner->runMultiple($cli);
```

#### More Complex Example

```php
$curl = new \Curl\Request();
$curl = new \Oksuz\Curl\Request();
$response = $curl->url("http://www.example.org/login")
->post(array("username" => "user", "password" => "password"))
->addCookieSupport()
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"ext-curl": "*"
},
"autoload":{
"psr-0": {
"Curl": "src"
"psr-4": {
"Oksuz\\": "src/"
}
}
}
4 changes: 2 additions & 2 deletions src/Curl/Request.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace Curl;
namespace Oksuz\Curl;

class Request
{
Expand Down Expand Up @@ -135,7 +135,7 @@ public function addHeader(Array $headers)
}

/**
* @return \Curl\Response
* @return Response
*/
public function result()
{
Expand Down
32 changes: 1 addition & 31 deletions src/Curl/Response.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace Curl;
namespace Oksuz\Curl;

class Response
{
Expand All @@ -10,85 +10,55 @@ class Response
$headerSize,
$url;

/**
* @return mixed
*/
public function getHeader()
{
return $this->header;
}

/**
* @param mixed $header
*/
public function setHeader($header)
{
$this->header = $header;
return $this;
}

/**
* @return mixed
*/
public function getHeaderSize()
{
return $this->headerSize;
}

/**
* @param mixed $headerSize
*/
public function setHeaderSize($headerSize)
{
$this->headerSize = $headerSize;
return $this;
}

/**
* @return mixed
*/
public function getResponse()
{
return $this->response;
}

/**
* @param mixed $response
*/
public function setResponse($response)
{
$this->response = $response;
return $this;
}

/**
* @return mixed
*/
public function getStatusCode()
{
return $this->statusCode;
}

/**
* @param mixed $statusCode
*/
public function setStatusCode($statusCode)
{
$this->statusCode = $statusCode;
return $this;
}

/**
* @return mixed
*/
public function getUrl()
{
return $this->url;
}

/**
* @param mixed $url
*/
public function setUrl($url)
{
$this->url = $url;
Expand Down
4 changes: 2 additions & 2 deletions src/Curl/Runner.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
namespace Curl;
namespace Oksuz\Curl;

class Runner
{
Expand Down Expand Up @@ -28,7 +28,7 @@ public function runMultiple(Array $curl)
} while ($running > 0);

$retVal = array();
/** @var \Curl\Request $c */
/** @var Request $c */
foreach ($chs as $url => &$c) {
$resp = curl_multi_getcontent($c->getCurl());
$retVal[] = $this->getCurlResponse($c, $resp);
Expand Down

0 comments on commit 3e4722b

Please sign in to comment.