Skip to content

Commit

Permalink
Prepare for 3.0.0 version release
Browse files Browse the repository at this point in the history
  • Loading branch information
Luis Fonseca committed Jul 10, 2017
1 parent 0073860 commit a013bd4
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 3.0.0 (2017-07-10)
[NEW] Added namespaces (thanks [@vinkla](https://github.com/vinkla)).

This comment has been minimized.

Copy link
@vinkla

vinkla Aug 9, 2017

Contributor

dance


## 2.6.4 (2017-06-11)
[FIXED] Log the curl error in more circumstances

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Or add to `composer.json`:

```json
"require": {
"pusher/pusher-php-server": "^2.6"
"pusher/pusher-php-server": "^3.0"
}
```

Expand All @@ -41,7 +41,7 @@ $app_key = 'YOUR_APP_KEY';
$app_secret = 'YOUR_APP_SECRET';
$app_cluster = 'YOUR_APP_CLUSTER';

$pusher = new Pusher( $app_key, $app_secret, $app_id, array('cluster' => $app_cluster) );
$pusher = new Pusher\Pusher( $app_key, $app_secret, $app_id, array('cluster' => $app_cluster) );
```

The fourth parameter is an `$options` array. The additional options are:
Expand Down Expand Up @@ -167,12 +167,12 @@ if (isset($_SESSION['user_id'])) {
$stmt->execute();
$user = $stmt->fetch();
} else {
die('aaargh, no-one is logged in')
die('aaargh, no-one is logged in');
}

header('Content-Type: application/json');

$pusher = new Pusher($key, $secret, $app_id);
$pusher = new Pusher\Pusher($key, $secret, $app_id);
$presence_data = array('name' => $user['name']);

echo $pusher->presence_auth($_POST['channel_name'], $_POST['socket_id'], $user['id'], $presence_data);
Expand Down Expand Up @@ -292,7 +292,7 @@ The native notifications API is hosted at `nativepush-cluster1.pusher.com` and o
If you wish to provide a different host you can do:

```php
$pusher = new Pusher($app_key, $app_secret, $app_id, array('notification_host' => 'custom notifications host'))
$pusher = new Pusher\Pusher($app_key, $app_secret, $app_id, array('notification_host' => 'custom notifications host'))
```
However, note that `notification_host` defaults to `nativepush-cluster1.pusher.com` and it is the only supported endpoint.

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pusher/pusher-php-server",
"description" : "Library for interacting with the Pusher REST API",
"keywords": ["php-pusher-server", "pusher", "rest", "realtime", "trigger", "publish", "events"],
"keywords": ["php-pusher-server", "pusher", "rest", "realtime", "real-time", "real time", "messaging", "push", "trigger", "publish", "events"],
"license": "MIT",
"require": {
"php": "^5.4 || ^7.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Pusher.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

class Pusher
{
public static $VERSION = '2.6.4';
public static $VERSION = '3.0.0';

private $settings = array(
'scheme' => 'http',
Expand Down

0 comments on commit a013bd4

Please sign in to comment.