Skip to content
This repository was archived by the owner on Sep 23, 2022. It is now read-only.

Commit a05c74c

Browse files
inoryyinoryy
committed
Merge pull request #3 from tzi/pr-composer-dependecies
Use of composer for autoload & dependencies
2 parents 5315785 + 52ebd17 commit a05c74c

18 files changed

+240
-289
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
composer.lock
2+
vendor
3+
.idea

‎.gitmodules

-3
This file was deleted.

‎LICENSE

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
Copyright (C) 2011 by KnpLabs <http://www.knplabs.com>
1+
The MIT License
2+
3+
Copyright (c) 2013 Knp Labs
24

35
Permission is hereby granted, free of charge, to any person obtaining a copy
46
of this software and associated documentation files (the "Software"), to deal

‎README.md

+43-20
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,59 @@ PiwikClient
33

44
PHP 5.3 client for [Piwik](http://piwik.org/) web analytics.
55

6+
To see all available methods & their parameters, visit [Piwik API Reference](http://piwik.org/docs/analytics-api/reference/).
7+
8+
69
Usage
710
-----
811

9-
1. Through HTTP connection:
12+
### Through HTTP connection
1013

11-
<?php
12-
13-
$connection = new Knp\PiwikClient\Connection\HttpConnection('http://demo.piwik.org');
14-
$client = new Knp\PiwikClient\Client($connection, 'YOUR_API_TOKEN');
15-
16-
$array = $client->call('API.getReportMetadata', array('idSites' => array(23, 55)));
17-
2. Through local (PHP) connection:
14+
```php
15+
use Knp\PiwikClient\Connection\HttpConnection;
16+
use Knp\PiwikClient\Client;
1817

19-
<?php
18+
// Instantiate piwik client
19+
$connection = new HttpConnection('http://demo.piwik.org');
20+
$client = new Client($connection, 'YOUR_API_TOKEN');
2021

21-
require_once PIWIK_INCLUDE_PATH . "/index.php";
22-
require_once PIWIK_INCLUDE_PATH . "/core/API/Request.php";
23-
Piwik_FrontController::getInstance()->init();
22+
// Call piwik API
23+
$array = $client->call('PLUGIN.METHOD', $parameters);
24+
```
2425

25-
$connection = new Knp\PiwikClient\Connection\PiwikConnection();
26-
$client = new Knp\PiwikClient\Client($connection, 'YOUR_API_TOKEN');
26+
### Through local (PHP) connection
2727

28-
$array = $client->call('API.getReportMetadata', array('idSites' => array(23, 55)));
28+
```php
29+
use Knp\PiwikClient\Connection\PiwikConnection;
30+
use Knp\PiwikClient\Client;
2931

30-
Methods
31-
-------
32+
// Instantiate piwik
33+
require_once PIWIK_INCLUDE_PATH . "/index.php";
34+
require_once PIWIK_INCLUDE_PATH . "/core/API/Request.php";
35+
Piwik_FrontController::getInstance()->init();
3236

33-
To see all available methods & their parameters, visit [Piwik API Reference](http://dev.piwik.org/trac/wiki/API/Reference).
37+
// Instantiate piwik client
38+
$connection = new PiwikConnection();
39+
$client = new Client($connection, 'YOUR_API_TOKEN');
3440

35-
Copyright
41+
// Call piwik API
42+
$array = $client->call('PLUGIN.METHOD', $parameters);
43+
```
44+
45+
46+
Installation
3647
---------
3748

38-
PiwikClient Copyright (c) 2011 KnpLabs <http://www.knplabs.com>. See LICENSE for details.
49+
This library can be installed using composer by adding the following in the require section of your composer.json file:
50+
51+
```json
52+
"require": {
53+
...
54+
"knplabs/knp-piwik-client": "dev-master"
55+
},
56+
```
57+
58+
59+
Copyright
60+
---------
61+
PiwikClient is released under the MIT License. See the bundled LICENSE file for details.

‎autoload.php.dist

-21
This file was deleted.

‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
"require": {
2121
"php": ">=5.3.0",
22-
"kriswallsmith/buzz": "*"
22+
"kriswallsmith/buzz": "0.10.*"
2323
},
2424

2525
"autoload": {

‎src/Knp/PiwikClient/Client.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
/*
44
* This file is part of the PiwikClient.
5-
* (c) 2011 Knp Labs <http://www.knplabs.com>
5+
* (c) 2013 Knp Labs <http://www.knplabs.com>
66
*
77
* For the full copyright and license information, please view the LICENSE
88
* file that was distributed with this source code.
@@ -32,7 +32,7 @@ class Client
3232
public function __construct(ConnectionInterface $connection, $token = 'anonymous')
3333
{
3434
$this->connection = $connection;
35-
$this->token = $token;
35+
$this->setToken($token);
3636
}
3737

3838
/**

‎src/Knp/PiwikClient/Connection/ConnectionInterface.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?php
22

3-
namespace Knp\PiwikClient\Connection;
4-
53
/*
64
* This file is part of the PiwikClient.
7-
* (c) 2011 Knp Labs <http://www.knplabs.com>
5+
* (c) 2013 Knp Labs <http://www.knplabs.com>
86
*
97
* For the full copyright and license information, please view the LICENSE
108
* file that was distributed with this source code.
119
*/
1210

11+
namespace Knp\PiwikClient\Connection;
12+
1313
/**
1414
* Piwik Client Abstract Connection.
1515
*

‎src/Knp/PiwikClient/Connection/HttpConnection.php

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?php
22

3-
namespace Knp\PiwikClient\Connection;
4-
5-
use Knp\PiwikClient\Exception\Exception as PiwikException;
6-
use Buzz\Browser,
7-
Buzz\Client\Curl;
8-
93
/*
104
* This file is part of the PiwikClient.
11-
* (c) 2011 Knp Labs <http://www.knplabs.com>
5+
* (c) 2013 Knp Labs <http://www.knplabs.com>
126
*
137
* For the full copyright and license information, please view the LICENSE
148
* file that was distributed with this source code.
159
*/
1610

11+
namespace Knp\PiwikClient\Connection;
12+
13+
use Knp\PiwikClient\Exception\Exception as PiwikException;
14+
use Buzz\Browser,
15+
Buzz\Client\Curl;
16+
1717
/**
1818
* Piwik HTTP Connector.
1919
*
@@ -51,8 +51,7 @@ public function send(array $params = array())
5151
$url = $this->apiUrl . '?' . $this->convertParamsToQuery($params);
5252

5353
$response = $this->browser->get($url);
54-
55-
if($response->getStatusCode() !== 200) {
54+
if(!$response->isSuccessful()) {
5655
throw new PiwikException(sprintf('"%s" returned an invalid status code: "%s"', $url, $response->getStatusCode()));
5756
}
5857

‎src/Knp/PiwikClient/Connection/PiwikConnection.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?php
22

3-
namespace Knp\PiwikClient\Connection;
4-
53
/*
64
* This file is part of the PiwikClient.
7-
* (c) 2011 Knp Labs <http://www.knplabs.com>
5+
* (c) 2013 Knp Labs <http://www.knplabs.com>
86
*
97
* For the full copyright and license information, please view the LICENSE
108
* file that was distributed with this source code.
119
*/
1210

11+
namespace Knp\PiwikClient\Connection;
12+
1313
/**
1414
* Piwik Lib Connector.
1515
*

‎src/Knp/PiwikClient/Connection/StubConnection.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?php
22

3-
namespace Knp\PiwikClient\Connection;
4-
53
/*
64
* This file is part of the PiwikClient.
7-
* (c) 2011 Knp Labs <http://www.knplabs.com>
5+
* (c) 2013 Knp Labs <http://www.knplabs.com>
86
*
97
* For the full copyright and license information, please view the LICENSE
108
* file that was distributed with this source code.
119
*/
1210

11+
namespace Knp\PiwikClient\Connection;
12+
1313
/**
1414
* Piwik Stub Connector.
1515
*

‎src/Knp/PiwikClient/Exception/Exception.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?php
22

3-
namespace Knp\PiwikClient\Exception;
4-
53
/*
64
* This file is part of the PiwikClient.
7-
* (c) 2011 Knp Labs <http://www.knplabs.com>
5+
* (c) 2013 Knp Labs <http://www.knplabs.com>
86
*
97
* For the full copyright and license information, please view the LICENSE
108
* file that was distributed with this source code.
119
*/
1210

11+
namespace Knp\PiwikClient\Exception;
12+
1313
/**
1414
* Piwik Client Exception.
1515
*

0 commit comments

Comments
 (0)