Merge pull request #1 from joshtronic/development
Vocab tweaks, 7.2 and HHVM testing, cleanup
This commit is contained in:
GitHub
commit
24b768a630
5 changed files with 69 additions and 72 deletions
|
|
@ -11,16 +11,22 @@ matrix:
|
||||||
- php: 5.6
|
- php: 5.6
|
||||||
- php: 7.0
|
- php: 7.0
|
||||||
- php: 7.1
|
- php: 7.1
|
||||||
|
- php: 7.2
|
||||||
|
- php: hhvm
|
||||||
|
env: HHVM=true
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- composer install
|
- composer install
|
||||||
|
- if [[ $HHVM == true ]]; then composer require "phpunit/phpunit:5.7"; fi
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- mkdir -p build/logs
|
- mkdir -p build/logs
|
||||||
- cd tests
|
- cd tests
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- phpunit --colors --coverage-clover ../build/logs/clover.xml .
|
- if [[ $HHVM == true ]]; then ../vendor/bin/phpunit --colors --coverage-clover ../build/logs/clover.xml .; fi
|
||||||
|
- if [[ $HHVM != true ]]; then phpunit --colors --coverage-clover ../build/logs/clover.xml .; fi
|
||||||
|
|
||||||
|
|
||||||
after_success:
|
after_success:
|
||||||
- cd ..
|
- cd ..
|
||||||
|
|
|
||||||
2
LICENSE
2
LICENSE
|
|
@ -1,6 +1,6 @@
|
||||||
The MIT License (MIT)
|
The MIT License (MIT)
|
||||||
|
|
||||||
Copyright (c) 2014, 2015, 2016 Josh Sherman
|
Copyright (c) 2014, 2015, 2016, 2017, 2018 Josh Sherman
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,22 @@
|
||||||
{
|
{
|
||||||
"name": "joshtronic/php-loremipsum",
|
"name": "joshtronic/php-loremipsum",
|
||||||
"description": "Lorem ipsum generator in PHP without dependencies",
|
"description": "Lorem ipsum generator in PHP without dependencies",
|
||||||
"version": "1.0.2",
|
"version": "1.0.3",
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"keywords": ["lorem", "ipsum", "generator"],
|
"keywords": [
|
||||||
"homepage": "https://github.com/joshtronic/php-loremipsum",
|
"lorem",
|
||||||
"license": "MIT",
|
"ipsum",
|
||||||
"authors": [{
|
"generator"
|
||||||
"name": "Josh Sherman",
|
],
|
||||||
"email": "josh@gravityblvd.com",
|
"homepage": "https://github.com/joshtronic/php-loremipsum",
|
||||||
"homepage": "http://joshtronic.com"
|
"license": "MIT",
|
||||||
}],
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Josh Sherman",
|
||||||
|
"email": "hello@joshtronic.com",
|
||||||
|
"homepage": "https://joshtronic.com"
|
||||||
|
}
|
||||||
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3.0"
|
"php": ">=5.3.0"
|
||||||
},
|
},
|
||||||
|
|
@ -18,6 +24,8 @@
|
||||||
"satooshi/php-coveralls": "~1.0"
|
"satooshi/php-coveralls": "~1.0"
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {"joshtronic\\": "src/"}
|
"psr-4": {
|
||||||
|
"joshtronic\\": "src/"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,8 +8,8 @@
|
||||||
* Licensed under The MIT License.
|
* Licensed under The MIT License.
|
||||||
* Redistribution of these files must retain the above copyright notice.
|
* Redistribution of these files must retain the above copyright notice.
|
||||||
*
|
*
|
||||||
* @author Josh Sherman <josh@gravityblvd.com>
|
* @author Josh Sherman <hello@joshtronic.com>
|
||||||
* @copyright Copyright 2014, 2015, 2016 Josh Sherman
|
* @copyright Copyright 2014, 2015, 2016, 2017, 2018 Josh Sherman
|
||||||
* @license http://www.opensource.org/licenses/mit-license.html
|
* @license http://www.opensource.org/licenses/mit-license.html
|
||||||
* @link https://github.com/joshtronic/php-loremipsum
|
* @link https://github.com/joshtronic/php-loremipsum
|
||||||
*/
|
*/
|
||||||
|
|
@ -39,53 +39,37 @@ class LoremIpsum
|
||||||
*/
|
*/
|
||||||
public $words = array(
|
public $words = array(
|
||||||
// Lorem ipsum...
|
// Lorem ipsum...
|
||||||
'lorem', 'ipsum', 'dolor', 'sit',
|
'lorem', 'ipsum', 'dolor', 'sit', 'amet', 'consectetur', 'adipiscing', 'elit',
|
||||||
'amet', 'consectetur', 'adipiscing', 'elit',
|
|
||||||
// The rest of the vocabulary
|
// and the rest of the vocabulary
|
||||||
'a', 'ac', 'accumsan', 'ad',
|
'a', 'ac', 'accumsan', 'ad', 'aenean', 'aliquam', 'aliquet', 'ante',
|
||||||
'aenean', 'aliquam', 'aliquet', 'ante',
|
'aptent', 'arcu', 'at', 'auctor', 'augue', 'bibendum', 'blandit',
|
||||||
'aptent', 'arcu', 'at', 'auctor',
|
'class', 'commodo', 'condimentum', 'congue', 'consequat', 'conubia',
|
||||||
'augue', 'bibendum', 'blandit', 'class',
|
'convallis', 'cras', 'cubilia', 'curabitur', 'curae', 'cursus',
|
||||||
'commodo', 'condimentum', 'congue', 'consequat',
|
'dapibus', 'diam', 'dictum', 'dictumst', 'dignissim', 'dis', 'donec',
|
||||||
'conubia', 'convallis', 'cras', 'cubilia',
|
'dui', 'duis', 'efficitur', 'egestas', 'eget', 'eleifend', 'elementum',
|
||||||
'cum', 'curabitur', 'curae', 'cursus',
|
'enim', 'erat', 'eros', 'est', 'et', 'etiam', 'eu', 'euismod', 'ex',
|
||||||
'dapibus', 'diam', 'dictum', 'dictumst',
|
'facilisi', 'facilisis', 'fames', 'faucibus', 'felis', 'fermentum',
|
||||||
'dignissim', 'dis', 'donec', 'dui',
|
'feugiat', 'finibus', 'fringilla', 'fusce', 'gravida', 'habitant',
|
||||||
'duis', 'egestas', 'eget', 'eleifend',
|
'habitasse', 'hac', 'hendrerit', 'himenaeos', 'iaculis', 'id',
|
||||||
'elementum', 'enim', 'erat', 'eros',
|
'imperdiet', 'in', 'inceptos', 'integer', 'interdum', 'justo',
|
||||||
'est', 'et', 'etiam', 'eu',
|
'lacinia', 'lacus', 'laoreet', 'lectus', 'leo', 'libero', 'ligula',
|
||||||
'euismod', 'facilisi', 'facilisis', 'fames',
|
'litora', 'lobortis', 'luctus', 'maecenas', 'magna', 'magnis',
|
||||||
'faucibus', 'felis', 'fermentum', 'feugiat',
|
'malesuada', 'massa', 'mattis', 'mauris', 'maximus', 'metus', 'mi',
|
||||||
'fringilla', 'fusce', 'gravida', 'habitant',
|
'molestie', 'mollis', 'montes', 'morbi', 'mus', 'nam', 'nascetur',
|
||||||
'habitasse', 'hac', 'hendrerit', 'himenaeos',
|
'natoque', 'nec', 'neque', 'netus', 'nibh', 'nisi', 'nisl', 'non',
|
||||||
'iaculis', 'id', 'imperdiet', 'in',
|
'nostra', 'nulla', 'nullam', 'nunc', 'odio', 'orci', 'ornare',
|
||||||
'inceptos', 'integer', 'interdum', 'justo',
|
'parturient', 'pellentesque', 'penatibus', 'per', 'pharetra',
|
||||||
'lacinia', 'lacus', 'laoreet', 'lectus',
|
'phasellus', 'placerat', 'platea', 'porta', 'porttitor', 'posuere',
|
||||||
'leo', 'libero', 'ligula', 'litora',
|
'potenti', 'praesent', 'pretium', 'primis', 'proin', 'pulvinar',
|
||||||
'lobortis', 'luctus', 'maecenas', 'magna',
|
'purus', 'quam', 'quis', 'quisque', 'rhoncus', 'ridiculus', 'risus',
|
||||||
'magnis', 'malesuada', 'massa', 'mattis',
|
'rutrum', 'sagittis', 'sapien', 'scelerisque', 'sed', 'sem', 'semper',
|
||||||
'mauris', 'metus', 'mi', 'molestie',
|
'senectus', 'sociosqu', 'sodales', 'sollicitudin', 'suscipit',
|
||||||
'mollis', 'montes', 'morbi', 'mus',
|
'suspendisse', 'taciti', 'tellus', 'tempor', 'tempus', 'tincidunt',
|
||||||
'nam', 'nascetur', 'natoque', 'nec',
|
'torquent', 'tortor', 'tristique', 'turpis', 'ullamcorper', 'ultrices',
|
||||||
'neque', 'netus', 'nibh', 'nisi',
|
'ultricies', 'urna', 'ut', 'varius', 'vehicula', 'vel', 'velit',
|
||||||
'nisl', 'non', 'nostra', 'nulla',
|
'venenatis', 'vestibulum', 'vitae', 'vivamus', 'viverra', 'volutpat',
|
||||||
'nullam', 'nunc', 'odio', 'orci',
|
'vulputate',
|
||||||
'ornare', 'parturient', 'pellentesque', 'penatibus',
|
|
||||||
'per', 'pharetra', 'phasellus', 'placerat',
|
|
||||||
'platea', 'porta', 'porttitor', 'posuere',
|
|
||||||
'potenti', 'praesent', 'pretium', 'primis',
|
|
||||||
'proin', 'pulvinar', 'purus', 'quam',
|
|
||||||
'quis', 'quisque', 'rhoncus', 'ridiculus',
|
|
||||||
'risus', 'rutrum', 'sagittis', 'sapien',
|
|
||||||
'scelerisque', 'sed', 'sem', 'semper',
|
|
||||||
'senectus', 'sociis', 'sociosqu', 'sodales',
|
|
||||||
'sollicitudin', 'suscipit', 'suspendisse', 'taciti',
|
|
||||||
'tellus', 'tempor', 'tempus', 'tincidunt',
|
|
||||||
'torquent', 'tortor', 'tristique', 'turpis',
|
|
||||||
'ullamcorper', 'ultrices', 'ultricies', 'urna',
|
|
||||||
'ut', 'varius', 'vehicula', 'vel',
|
|
||||||
'velit', 'venenatis', 'vestibulum', 'vitae',
|
|
||||||
'vivamus', 'viverra', 'volutpat', 'vulputate',
|
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,10 @@
|
||||||
|
|
||||||
require_once '../src/LoremIpsum.php';
|
require_once '../src/LoremIpsum.php';
|
||||||
|
|
||||||
if (!class_exists('\PHPUnit_Framework_TestCase') && class_exists('\PHPUnit\Framework\TestCase')) {
|
if (
|
||||||
|
!class_exists('\PHPUnit_Framework_TestCase')
|
||||||
|
&& class_exists('\PHPUnit\Framework\TestCase')
|
||||||
|
) {
|
||||||
class_alias('\PHPUnit\Framework\TestCase', '\PHPUnit_Framework_TestCase');
|
class_alias('\PHPUnit\Framework\TestCase', '\PHPUnit_Framework_TestCase');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -34,8 +37,7 @@ class LoremIpsumTest extends PHPUnit_Framework_TestCase
|
||||||
$this->assertTrue(is_array($words));
|
$this->assertTrue(is_array($words));
|
||||||
$this->assertCount(3, $words);
|
$this->assertCount(3, $words);
|
||||||
|
|
||||||
foreach ($words as $word)
|
foreach ($words as $word) {
|
||||||
{
|
|
||||||
$this->assertRegExp('/^[a-z]+$/i', $word);
|
$this->assertRegExp('/^[a-z]+$/i', $word);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -61,8 +63,7 @@ class LoremIpsumTest extends PHPUnit_Framework_TestCase
|
||||||
$this->assertTrue(is_array($sentences));
|
$this->assertTrue(is_array($sentences));
|
||||||
$this->assertCount(3, $sentences);
|
$this->assertCount(3, $sentences);
|
||||||
|
|
||||||
foreach ($sentences as $sentence)
|
foreach ($sentences as $sentence) {
|
||||||
{
|
|
||||||
$this->assertRegExp('/^[a-z, ]+\.$/i', $sentence);
|
$this->assertRegExp('/^[a-z, ]+\.$/i', $sentence);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -86,8 +87,7 @@ class LoremIpsumTest extends PHPUnit_Framework_TestCase
|
||||||
$this->assertTrue(is_array($paragraphs));
|
$this->assertTrue(is_array($paragraphs));
|
||||||
$this->assertCount(3, $paragraphs);
|
$this->assertCount(3, $paragraphs);
|
||||||
|
|
||||||
foreach ($paragraphs as $paragraph)
|
foreach ($paragraphs as $paragraph) {
|
||||||
{
|
|
||||||
$this->assertRegExp('/^([a-z, ]+\.)+$/i', $paragraph);
|
$this->assertRegExp('/^([a-z, ]+\.)+$/i', $paragraph);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -122,8 +122,7 @@ class LoremIpsumTest extends PHPUnit_Framework_TestCase
|
||||||
$this->assertTrue(is_array($words));
|
$this->assertTrue(is_array($words));
|
||||||
$this->assertCount(3, $words);
|
$this->assertCount(3, $words);
|
||||||
|
|
||||||
foreach ($words as $word)
|
foreach ($words as $word) {
|
||||||
{
|
|
||||||
$this->assertRegExp('/^<li>[a-z]+<\/li>$/i', $word);
|
$this->assertRegExp('/^<li>[a-z]+<\/li>$/i', $word);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue