Permalink
Browse files

Merge pull request #2 from rajasekharponakala/trunk

there are some spelling mistakes, license errors and http to https can be changed
  • Loading branch information...
ashnazg committed Mar 6, 2017
2 parents d00234b + f0ae7bf commit e30a817c267fca2c180741ba8c0d54b3ef1eaebe
Showing with 13 additions and 13 deletions.
  1. +7 −7 Net/IDNA2.php
  2. +2 −2 composer.json
  3. +3 −3 package.xml
  4. +1 −1 tests/draft-josefsson-idn-test-vectors.php
View
@@ -29,7 +29,7 @@
/**
* Encode/decode Internationalized Domain Names.
*
* The class allows to convert internationalized domain names
* The class allows one to convert internationalized domain names
* (see RFC 3490 for details) as they can be used with various registries worldwide
* to be translated between their original (localized) form and their encoded form
* as it will be used in the DNS (Domain Name System).
@@ -2426,7 +2426,7 @@ public function decode($input, $one_time_encoding = false)
// Make sure to drop any newline characters around
$input = trim($input);
// Negotiate input and try to determine, wether it is a plain string,
// Negotiate input and try to determine, whether it is a plain string,
// an email address or something like a complete URL
if (strpos($input, '@')) { // Maybe it is an email address
// No no in strict mode
@@ -2678,7 +2678,7 @@ private function _decode($encoded)
return false;
}
// Find last occurence of the delimiter
// Find last occurrence of the delimiter
$delim_pos = strrpos($encoded, '-');
if ($delim_pos > self::_byteLength($this->_punycode_prefix)) {
@@ -2796,7 +2796,7 @@ private function _nameprep($input)
// Walking through the input array, performing the required steps on each of
// the input chars and putting the result into the output array
// While mapping required chars we apply the cannonical ordering
// While mapping required chars we apply the canonical ordering
foreach ($input as $v) {
// Map to nothing == skip that code point
@@ -2988,7 +2988,7 @@ private function _getCombiningClass($char)
}
/**
* Apllies the cannonical ordering of a decomposed UCS4 sequence.
* Apllies the canonical ordering of a decomposed UCS4 sequence.
*
* @param array $input Decomposed UCS4 sequence
*
@@ -3114,7 +3114,7 @@ private function _utf8_to_ucs4($input)
for ($k = 0; $k < $inp_len; ++$k) {
$v = ord($input{$k}); // Extract byte from input string
if ($v < 128) { // We found an ASCII char - put into stirng as is
if ($v < 128) { // We found an ASCII char - put into string as is
$output[$out_len] = $v;
++$out_len;
if ('add' == $mode) {
@@ -3377,7 +3377,7 @@ public static function getInstance($params = array())
* only creating a new instance if no IDNA instance with the same
* parameters currently exists.
*
* @param array $params Set of paramaters
* @param array $params Set of parameters
*
* @return object Net_IDNA2
* @access public
View
@@ -16,14 +16,14 @@
"Net": "./"
}
},
"description": "More info available on: http://pear.php.net/package/Net_IDNA2",
"description": "More info available on: https://pear.php.net/package/Net_IDNA2",
"include-path": [
"./"
],
"license": "LGPL",
"name": "pear/net_idna2",
"support": {
"issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Net_IDNA2",
"issues": "https://pear.php.net/bugs/search.php?cmd=display&package_name[]=Net_IDNA2",
"source": "https://github.com/pear/Net_IDNA2"
},
"type": "library",
View
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<package packagerversion="1.9.1" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
<package packagerversion="1.9.1" version="2.0" xmlns="https://pear.php.net/dtd/package-2.0" xmlns:tasks="https://pear.php.net/dtd/tasks-1.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://pear.php.net/dtd/tasks-1.0 https://pear.php.net/dtd/tasks-1.0.xsd https://pear.php.net/dtd/package-2.0 https://pear.php.net/dtd/package-2.0.xsd">
<name>Net_IDNA2</name>
<channel>pear.php.net</channel>
<summary>Punycode encoding and decoding.</summary>
@@ -26,7 +26,7 @@
<release>beta</release>
<api>beta</api>
</stability>
<license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
<license uri="https://www.gnu.org/copyleft/lesser.html">LGPL</license>
<notes>
* Added initial support for IDNA2008. This is needed for characters like the German
&quot;Eszett&quot; which would otherwise be turned into &quot;ss&quot; during nameprep.
@@ -72,7 +72,7 @@
<api>beta</api>
</stability>
<date>2010-06-03</date>
<license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
<license uri="https://www.gnu.org/copyleft/lesser.html">LGPL</license>
<notes>
QA Release
Bug #17430 Multiple Net_IDNA class declarations
@@ -1,7 +1,7 @@
<?php
require_once 'Net/IDNA2.php';
// Test cases from http://www.gnu.org/software/libidn/draft-josefsson-idn-test-vectors.html
// Test cases from https://www.gnu.org/software/libidn/draft-josefsson-idn-test-vectors.html
define('IDNA_ACE_PREFIX', 'xn--');

0 comments on commit e30a817

Please sign in to comment.