Merge branch 'lib-upgrades' into 'master'
Third-party library upgrades * lib: Upgrade php-gettext from 1.0.11 to 1.0.12 * lib: Upgrade accept-to-gettext.php from 2003-08-14 to 2007-04-01 * lib: Upgrade JShrink from 0.5.1 to 1.1.0 * lib: Upgrade mobile-detect from svn r44 (2012-05-03) to 2.8.24 (2016-11-11) * lib: Upgrade php-publisher from ??? to a5d6a0e (2016-11-15) * lib: Upgrade php-subscriber from ??? to 1213f89 (2016-11-15) * lib: Upgrade script.aculo.us from 1.8.3 to 1.9.0 * lib: Upgrade timezones.txt from 2010k/l/m/n/2011a to 2016j See merge request !40master
Andrew Dolgov
8 years ago
commit
0047f2578f
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
@ -1,21 +1,61 @@
|
||||
JShrink is a php class that minifies javascript so that it can be delivered to the client quicker. This code can be used by any product looking to minify their javascript on the fly (although caching the results is suggested for performance reasons). Unlike many other products this is not a port into php but a native application, resulting in better performance.
|
||||
# JShrink [](https://travis-ci.org/tedivm/JShrink)
|
||||
|
||||
### Usage
|
||||
[](https://github.com/tedivm/JShrink/blob/master/LICENSE)
|
||||
[](https://packagist.org/packages/tedivm/JShrink)
|
||||
[](https://coveralls.io/r/tedivm/JShrink?branch=master)
|
||||
[](https://packagist.org/packages/tedivm/JShrink)
|
||||
|
||||
|
||||
JShrink is a php class that minifies javascript so that it can be delivered to the client quicker. This code can be used
|
||||
by any product looking to minify their javascript on the fly (although caching the results is suggested for performance
|
||||
reasons). Unlike many other products this is not a port into php but a native application, resulting in better
|
||||
performance.
|
||||
|
||||
|
||||
## Usage
|
||||
|
||||
Minifying your code is simple call to a static function-
|
||||
|
||||
````
|
||||
```php
|
||||
<?php
|
||||
include('vendor/autoload.php');
|
||||
|
||||
// Basic (default) usage.
|
||||
$minifiedCode = JShrink\Minifier::minify($js);
|
||||
$minifiedCode = \JShrink\Minifier::minify($js);
|
||||
|
||||
// Disable YUI style comment preservation.
|
||||
$minifiedCode = JShrink\Minifier::minify($js, array('flaggedComments' => false));
|
||||
````
|
||||
$minifiedCode = \JShrink\Minifier::minify($js, array('flaggedComments' => false));
|
||||
```
|
||||
|
||||
### Results
|
||||
|
||||
## Results
|
||||
|
||||
* Raw - 586,990
|
||||
* Gzip - 151,301
|
||||
* JShrink - 371,982
|
||||
* JShrink and Gzip - 93,507
|
||||
|
||||
|
||||
## Installing
|
||||
|
||||
### Composer
|
||||
|
||||
Installing JShrink can be done through a variety of methods, although Composer is
|
||||
recommended.
|
||||
|
||||
```yaml
|
||||
"require": {
|
||||
"tedivm/jshrink": "~1.0"
|
||||
}
|
||||
```
|
||||
|
||||
### Github
|
||||
|
||||
Releases of JShrink are available on [Github](https://github.com/tedious/JShrink/releases).
|
||||
|
||||
|
||||
## License
|
||||
|
||||
JShrink is licensed under the BSD License. See the LICENSE file for details.
|
||||
|
||||
In the spirit of open source, use of this library for evil is discouraged but not prohibited.
|
||||
|
||||
@ -0,0 +1,125 @@
|
||||
<?php
|
||||
/**
|
||||
* a PHP client library for pubsubhubbub.
|
||||
*
|
||||
* @link https://github.com/pubsubhubbub/
|
||||
*
|
||||
* @author Josh Fraser | joshfraser.com | josh@eventvue.com
|
||||
* @license Apache License 2.0
|
||||
*/
|
||||
namespace pubsubhubbub\publisher;
|
||||
|
||||
use InvalidArgumentException;
|
||||
|
||||
class Publisher
|
||||
{
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
protected $hub_url;
|
||||
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
protected $last_response;
|
||||
|
||||
/**
|
||||
* Create a new Publisher.
|
||||
*
|
||||
* @param string $hub_url
|
||||
*/
|
||||
public function __construct($hub_url)
|
||||
{
|
||||
if (! isset($hub_url)) {
|
||||
throw new InvalidArgumentException('Please specify a hub url');
|
||||
}
|
||||
|
||||
if (! preg_match('|^https?://|i', $hub_url)) {
|
||||
throw new InvalidArgumentException('The specified hub url does not appear to be valid: ' . $hub_url);
|
||||
}
|
||||
|
||||
$this->hub_url = $hub_url;
|
||||
}
|
||||
|
||||
/**
|
||||
* Accepts either a single url or an array of urls.
|
||||
*
|
||||
* @param string|array $topic_urls
|
||||
* @param callable $http_function
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function publish_update($topic_urls, $http_function = false)
|
||||
{
|
||||
if (! isset($topic_urls)) {
|
||||
throw new InvalidArgumentException('Please specify a topic url');
|
||||
}
|
||||
|
||||
// check that we're working with an array
|
||||
if (! is_array($topic_urls)) {
|
||||
$topic_urls = [$topic_urls];
|
||||
}
|
||||
|
||||
// set the mode to publish
|
||||
$post_string = 'hub.mode=publish';
|
||||
// loop through each topic url
|
||||
foreach ($topic_urls as $topic_url) {
|
||||
|
||||
// lightweight check that we're actually working w/ a valid url
|
||||
if (! preg_match('|^https?://|i', $topic_url)) {
|
||||
throw new InvalidArgumentException('The specified topic url does not appear to be valid: ' . $topic_url);
|
||||
}
|
||||
|
||||
// append the topic url parameters
|
||||
$post_string .= '&hub.url=' . urlencode($topic_url);
|
||||
}
|
||||
|
||||
// make the http post request and return true/false
|
||||
// easy to over-write to use your own http function
|
||||
if ($http_function) {
|
||||
return $http_function($this->hub_url, $post_string);
|
||||
}
|
||||
|
||||
return $this->http_post($this->hub_url, $post_string);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns any error message from the latest request.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function last_response()
|
||||
{
|
||||
return $this->last_response;
|
||||
}
|
||||
|
||||
/**
|
||||
* Default http function that uses curl to post to the hub endpoint.
|
||||
*
|
||||
* @param string $url
|
||||
* @param string $post_string
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
private function http_post($url, $post_string)
|
||||
{
|
||||
// add any additional curl options here
|
||||
$options = [
|
||||
CURLOPT_URL => $url,
|
||||
CURLOPT_POST => true,
|
||||
CURLOPT_POSTFIELDS => $post_string,
|
||||
CURLOPT_USERAGENT => 'PubSubHubbub-Publisher-PHP/1.0',
|
||||
];
|
||||
|
||||
$ch = curl_init();
|
||||
curl_setopt_array($ch, $options);
|
||||
|
||||
$response = curl_exec($ch);
|
||||
$this->last_response = $response;
|
||||
$info = curl_getinfo($ch);
|
||||
|
||||
curl_close($ch);
|
||||
|
||||
return $info['http_code'] == 204;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,210 @@
|
||||
<?php
|
||||
/**
|
||||
* A PHP client library for pubsubhubbub.
|
||||
*
|
||||
* @link http://code.google.com/p/pubsubhubbub/
|
||||
*
|
||||
* @author Josh Fraser | joshfraser.com | josh@eventvue.com
|
||||
* @license Apache License 2.0
|
||||
*/
|
||||
namespace Pubsubhubbub\Subscriber;
|
||||
|
||||
use InvalidArgumentException;
|
||||
|
||||
class Subscriber
|
||||
{
|
||||
/**
|
||||
* Put your google key here.
|
||||
* Required if you want to use the google feed API to lookup RSS feeds.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $google_key = '';
|
||||
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
protected $hub_url;
|
||||
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
protected $callback_url;
|
||||
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
protected $credentials;
|
||||
|
||||
/**
|
||||
* @var string accepted values are "async" and "sync"
|
||||
*/
|
||||
protected $verify = 'async';
|
||||
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
protected $verify_token;
|
||||
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
protected $lease_seconds;
|
||||
|
||||
/**
|
||||
* Create a new Subscriber (credentials added for SuperFeedr support).
|
||||
*
|
||||
* @param string $hub_url
|
||||
* @param string $callback_url
|
||||
* @param string $credentials
|
||||
*/
|
||||
public function __construct($hub_url, $callback_url, $credentials = false)
|
||||
{
|
||||
if (! isset($hub_url)) {
|
||||
throw new InvalidArgumentException('Please specify a hub url');
|
||||
}
|
||||
|
||||
if (! preg_match('|^https?://|i', $hub_url)) {
|
||||
throw new InvalidArgumentException('The specified hub url does not appear to be valid: ' . $hub_url);
|
||||
}
|
||||
|
||||
if (! isset($callback_url)) {
|
||||
throw new InvalidArgumentException('Please specify a callback');
|
||||
}
|
||||
|
||||
$this->hub_url = $hub_url;
|
||||
$this->callback_url = $callback_url;
|
||||
$this->credentials = $credentials;
|
||||
}
|
||||
|
||||
/**
|
||||
* $use_regexp lets you choose whether to use google AJAX feed api (faster, but cached) or a regexp to read from site.
|
||||
*
|
||||
* @param string $url
|
||||
* @param callable $http_function
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function find_feed($url, $http_function = false)
|
||||
{
|
||||
// using google feed API
|
||||
$url = "http://ajax.googleapis.com/ajax/services/feed/lookup?key={$this->google_key}&v=1.0&q=" . urlencode($url);
|
||||
// fetch the content
|
||||
if ($http_function) {
|
||||
$response = $http_function($url);
|
||||
} else {
|
||||
$response = $this->http($url);
|
||||
}
|
||||
|
||||
$result = json_decode($response, true);
|
||||
$rss_url = $result['responseData']['url'];
|
||||
|
||||
return $rss_url;
|
||||
}
|
||||
|
||||
/**
|
||||
* Subscribe to a topic.
|
||||
*
|
||||
* @param string $topic_url
|
||||
* @param callable $http_function
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function subscribe($topic_url, $http_function = false)
|
||||
{
|
||||
return $this->change_subscription('subscribe', $topic_url, $http_function);
|
||||
}
|
||||
|
||||
/**
|
||||
* Unsubscribe from a topic.
|
||||
*
|
||||
* @param string $topic_url
|
||||
* @param callable $http_function
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function unsubscribe($topic_url, $http_function = false)
|
||||
{
|
||||
return $this->change_subscription('unsubscribe', $topic_url, $http_function);
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper function since sub/unsub are handled the same way.
|
||||
*
|
||||
* @param string $mode
|
||||
* @param string $topic_url
|
||||
* @param callable $http_function
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
private function change_subscription($mode, $topic_url, $http_function = false)
|
||||
{
|
||||
if (! isset($topic_url)) {
|
||||
throw new InvalidArgumentException('Please specify a topic url');
|
||||
}
|
||||
|
||||
// lightweight check that we're actually working w/ a valid url
|
||||
if (! preg_match('|^https?://|i', $topic_url)) {
|
||||
throw new InvalidArgumentException('The specified topic url does not appear to be valid: ' . $topic_url);
|
||||
}
|
||||
|
||||
// set the mode subscribe/unsubscribe
|
||||
$post_string = 'hub.mode=' . $mode;
|
||||
$post_string .= '&hub.callback=' . urlencode($this->callback_url);
|
||||
$post_string .= '&hub.verify=' . $this->verify;
|
||||
$post_string .= '&hub.verify_token=' . $this->verify_token;
|
||||
$post_string .= '&hub.lease_seconds=' . $this->lease_seconds;
|
||||
|
||||
// append the topic url parameters
|
||||
$post_string .= '&hub.topic=' . urlencode($topic_url);
|
||||
|
||||
// make the http post request and return true/false
|
||||
// easy to over-write to use your own http function
|
||||
if ($http_function) {
|
||||
return call_user_func_array($http_function, [$this->hub_url, $post_string]);
|
||||
}
|
||||
|
||||
return $this->http($this->hub_url, $post_string);
|
||||
}
|
||||
|
||||
/**
|
||||
* Default http function that uses curl to post to the hub endpoint.
|
||||
*
|
||||
* @param string $url
|
||||
* @param string $post_string
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
private function http($url, $post_string)
|
||||
{
|
||||
|
||||
// add any additional curl options here
|
||||
$options = [
|
||||
CURLOPT_URL => $url,
|
||||
CURLOPT_USERAGENT => 'PubSubHubbub-Subscriber-PHP/1.0',
|
||||
CURLOPT_RETURNTRANSFER => true,
|
||||
];
|
||||
|
||||
if ($post_string) {
|
||||
$options[CURLOPT_POST] = true;
|
||||
$options[CURLOPT_POSTFIELDS] = $post_string;
|
||||
}
|
||||
|
||||
if ($this->credentials) {
|
||||
$options[CURLOPT_USERPWD] = $this->credentials;
|
||||
}
|
||||
|
||||
$ch = curl_init();
|
||||
curl_setopt_array($ch, $options);
|
||||
|
||||
$response = curl_exec($ch);
|
||||
$info = curl_getinfo($ch);
|
||||
|
||||
// all good -- anything in the 200 range
|
||||
if (substr($info['http_code'], 0, 1) == '2') {
|
||||
return $response;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@ -1,86 +0,0 @@
|
||||
<?php
|
||||
|
||||
// a PHP client library for pubsubhubbub
|
||||
// as defined at http://code.google.com/p/pubsubhubbub/
|
||||
// written by Josh Fraser | joshfraser.com | josh@eventvue.com
|
||||
// Released under Apache License 2.0
|
||||
|
||||
class Publisher {
|
||||
|
||||
protected $hub_url;
|
||||
protected $last_response;
|
||||
|
||||
// create a new Publisher
|
||||
public function __construct($hub_url) {
|
||||
|
||||
if (!isset($hub_url))
|
||||
throw new Exception('Please specify a hub url');
|
||||
|
||||
if (!preg_match("|^https?://|i",$hub_url))
|
||||
throw new Exception('The specified hub url does not appear to be valid: '.$hub_url);
|
||||
|
||||
$this->hub_url = $hub_url;
|
||||
}
|
||||
|
||||
// accepts either a single url or an array of urls
|
||||
public function publish_update($topic_urls, $http_function = false) {
|
||||
if (!isset($topic_urls))
|
||||
throw new Exception('Please specify a topic url');
|
||||
|
||||
// check that we're working with an array
|
||||
if (!is_array($topic_urls)) {
|
||||
$topic_urls = array($topic_urls);
|
||||
}
|
||||
|
||||
// set the mode to publish
|
||||
$post_string = "hub.mode=publish";
|
||||
// loop through each topic url
|
||||
foreach ($topic_urls as $topic_url) {
|
||||
|
||||
// lightweight check that we're actually working w/ a valid url
|
||||
if (!preg_match("|^https?://|i",$topic_url))
|
||||
throw new Exception('The specified topic url does not appear to be valid: '.$topic_url);
|
||||
|
||||
// append the topic url parameters
|
||||
$post_string .= "&hub.url=".urlencode($topic_url);
|
||||
}
|
||||
|
||||
// make the http post request and return true/false
|
||||
// easy to over-write to use your own http function
|
||||
if ($http_function)
|
||||
return $http_function($this->hub_url,$post_string);
|
||||
else
|
||||
return $this->http_post($this->hub_url,$post_string);
|
||||
}
|
||||
|
||||
// returns any error message from the latest request
|
||||
public function last_response() {
|
||||
return $this->last_response;
|
||||
}
|
||||
|
||||
// default http function that uses curl to post to the hub endpoint
|
||||
private function http_post($url, $post_string) {
|
||||
|
||||
// add any additional curl options here
|
||||
$options = array(CURLOPT_URL => $url,
|
||||
CURLOPT_POST => true,
|
||||
CURLOPT_POSTFIELDS => $post_string,
|
||||
CURLOPT_USERAGENT => "PubSubHubbub-Publisher-PHP/1.0");
|
||||
|
||||
$ch = curl_init();
|
||||
curl_setopt_array($ch, $options);
|
||||
|
||||
$response = curl_exec($ch);
|
||||
$this->last_response = $response;
|
||||
$info = curl_getinfo($ch);
|
||||
|
||||
curl_close($ch);
|
||||
|
||||
// all good
|
||||
if ($info['http_code'] == 204)
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
@ -1,120 +0,0 @@
|
||||
<?php
|
||||
|
||||
// a PHP client library for pubsubhubbub
|
||||
// as defined at http://code.google.com/p/pubsubhubbub/
|
||||
// written by Josh Fraser | joshfraser.com | josh@eventvue.com
|
||||
// Released under Apache License 2.0
|
||||
|
||||
class Subscriber {
|
||||
|
||||
// put your google key here
|
||||
// required if you want to use the google feed API to lookup RSS feeds
|
||||
protected $google_key = "";
|
||||
|
||||
protected $hub_url;
|
||||
protected $callback_url;
|
||||
protected $credentials;
|
||||
// accepted values are "async" and "sync"
|
||||
protected $verify = "async";
|
||||
protected $verify_token;
|
||||
protected $lease_seconds;
|
||||
|
||||
// create a new Subscriber (credentials added for SuperFeedr support)
|
||||
public function __construct($hub_url, $callback_url, $credentials = false) {
|
||||
|
||||
if (!isset($hub_url))
|
||||
throw new Exception('Please specify a hub url');
|
||||
|
||||
if (!preg_match("|^https?://|i",$hub_url))
|
||||
throw new Exception('The specified hub url does not appear to be valid: '.$hub_url);
|
||||
|
||||
if (!isset($callback_url))
|
||||
throw new Exception('Please specify a callback');
|
||||
|
||||
$this->hub_url = $hub_url;
|
||||
$this->callback_url = $callback_url;
|
||||
$this->credentials = $credentials;
|
||||
}
|
||||
|
||||
// $use_regexp lets you choose whether to use google AJAX feed api (faster, but cached) or a regexp to read from site
|
||||
public function find_feed($url, $http_function = false) {
|
||||
// using google feed API
|
||||
$url = "http://ajax.googleapis.com/ajax/services/feed/lookup?key={$this->google_key}&v=1.0&q=".urlencode($url);
|
||||
// fetch the content
|
||||
if ($http_function)
|
||||
$response = $http_function($url);
|
||||
else
|
||||
$response = $this->http($url);
|
||||
|
||||
$result = json_decode($response, true);
|
||||
$rss_url = $result['responseData']['url'];
|
||||
return $rss_url;
|
||||
}
|
||||
|
||||
public function subscribe($topic_url, $http_function = false) {
|
||||
return $this->change_subscription("subscribe", $topic_url, $http_function = false);
|
||||
}
|
||||
|
||||
public function unsubscribe($topic_url, $http_function = false) {
|
||||
return $this->change_subscription("unsubscribe", $topic_url, $http_function = false);
|
||||
}
|
||||
|
||||
// helper function since sub/unsub are handled the same way
|
||||
private function change_subscription($mode, $topic_url, $http_function = false) {
|
||||
if (!isset($topic_url))
|
||||
throw new Exception('Please specify a topic url');
|
||||
|
||||
// lightweight check that we're actually working w/ a valid url
|
||||
if (!preg_match("|^https?://|i",$topic_url))
|
||||
throw new Exception('The specified topic url does not appear to be valid: '.$topic_url);
|
||||
|
||||
// set the mode subscribe/unsubscribe
|
||||
$post_string = "hub.mode=".$mode;
|
||||
$post_string .= "&hub.callback=".urlencode($this->callback_url);
|
||||
$post_string .= "&hub.verify=".$this->verify;
|
||||
$post_string .= "&hub.verify_token=".$this->verify_token;
|
||||
$post_string .= "&hub.lease_seconds=".$this->lease_seconds;
|
||||
|
||||
// append the topic url parameters
|
||||
$post_string .= "&hub.topic=".urlencode($topic_url);
|
||||
|
||||
// make the http post request and return true/false
|
||||
// easy to over-write to use your own http function
|
||||
if ($http_function)
|
||||
return $http_function($this->hub_url,$post_string);
|
||||
else
|
||||
return $this->http($this->hub_url,$post_string);
|
||||
}
|
||||
|
||||
// default http function that uses curl to post to the hub endpoint
|
||||
private function http($url, $post_string) {
|
||||
|
||||
// add any additional curl options here
|
||||
$options = array(CURLOPT_URL => $url,
|
||||
CURLOPT_USERAGENT => "PubSubHubbub-Subscriber-PHP/1.0",
|
||||
CURLOPT_RETURNTRANSFER => true);
|
||||
|
||||
if ($post_string) {
|
||||
$options[CURLOPT_POST] = true;
|
||||
$options[CURLOPT_POSTFIELDS] = $post_string;
|
||||
}
|
||||
|
||||
if ($this->credentials)
|
||||
$options[CURLOPT_USERPWD] = $this->credentials;
|
||||
|
||||
$ch = curl_init();
|
||||
curl_setopt_array($ch, $options);
|
||||
|
||||
$response = curl_exec($ch);
|
||||
$info = curl_getinfo($ch);
|
||||
|
||||
// all good -- anything in the 200 range
|
||||
if (substr($info['http_code'],0,1) == "2") {
|
||||
return $response;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
?>
|
||||
Loading…
Reference in New Issue