Skip to content

Commit e42d6ba

Browse files
committed
Merge pull request #4 from phillipsdata/update-namespace
Changed namespace from `minphp\Language` to `Minphp\Language`
2 parents 41c961a + d4c230f commit e42d6ba

File tree

4 files changed

+20
-16
lines changed

4 files changed

+20
-16
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# minphp/Language
1+
# Minphp/Language
22

33
[![Build Status](https://travis-ci.org/phillipsdata/minphp-language.svg?branch=master)](https://travis-ci.org/phillipsdata/minphp-language) [![Coverage Status](https://coveralls.io/repos/phillipsdata/minphp-language/badge.svg)](https://coveralls.io/r/phillipsdata/minphp-language)
44

composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
"satooshi/php-coveralls": "dev-master"
2020
},
2121
"autoload": {
22-
"psr-4": {"minphp\\Language\\": "src"}
22+
"psr-4": {"Minphp\\Language\\": "src"}
23+
},
24+
"autoload-dev": {
25+
"psr-4": {"Minphp\\Language\\Tests\\": "tests"}
2326
}
2427
}

src/Language.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
namespace minphp\Language;
2+
namespace Minphp\Language;
33

44
if (!defined("LANGDIR")) {
55
define("LANGDIR", ".." . DIRECTORY_SEPARATOR . ".." . DIRECTORY_SEPARATOR . "language" . DIRECTORY_SEPARATOR);
@@ -73,7 +73,7 @@ public static function _($lang_key, $return = false)
7373
{
7474
// @codingStandardsIgnoreEnd
7575
$args = func_get_args();
76-
return call_user_func_array(array("\minphp\Language\Language", "getText"), $args);
76+
return call_user_func_array(array("\Minphp\Language\Language", "getText"), $args);
7777
}
7878

7979
/**

tests/LanguageTest.php

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
2-
namespace minphp\Language;
2+
namespace Minphp\Language\Tests;
33

4-
use \PHPUnit_Framework_TestCase;
4+
use PHPUnit_Framework_TestCase;
5+
use Minphp\Language\Language;
56

67
/**
7-
* @coversDefaultClass \minphp\Language\Language
8+
* @coversDefaultClass \Minphp\Language\Language
89
*/
910
class LanguageTest extends PHPUnit_Framework_TestCase
1011
{
@@ -28,7 +29,7 @@ public function testShortGetText()
2829
{
2930
Language::setLang("en_us");
3031
Language::loadLang("language_test", "en_us", $this->lang_path);
31-
32+
3233
$this->assertEquals("The blue car is fast.", Language::_("LanguageTest.b", true, "blue", "fast", "car"));
3334
}
3435

@@ -41,7 +42,7 @@ public function testGetText()
4142
{
4243
Language::setLang("en_us");
4344
Language::loadLang("language_test", "en_uk", $this->lang_path);
44-
45+
4546
$this->assertEquals(
4647
"The blue car is fast.",
4748
Language::getText("LanguageTest.b", true, "blue", "fast", "car")
@@ -50,15 +51,15 @@ public function testGetText()
5051
"The blue car is fast.",
5152
Language::getText("LanguageTest.b", true, array("blue", "fast", "car"))
5253
);
53-
54+
5455
$this->assertEquals("I like the color green.", Language::getText("LanguageTest.a", true));
55-
56+
5657
Language::setLang("en_uk");
5758
$this->assertEquals("The blue car is fast.", Language::getText("LanguageTest.b", true, "blue", "fast", "car"));
58-
59+
5960
Language::allowPassthrough(true);
6061
$this->assertEquals("Non-existent", Language::getText("Non-existent", true));
61-
62+
6263
$this->expectOutputString("I like the colour green.");
6364
Language::getText("LanguageTest.a");
6465
}
@@ -72,10 +73,10 @@ public function testLoadLang()
7273
Language::setDefaultLanguage("en_uk");
7374
Language::loadLang("language_test", null, $this->lang_path);
7475
Language::loadLang(array("language_test", "language_not_exists"), null, $this->lang_path);
75-
76+
7677
Language::setLang("en_us");
7778
$this->assertEquals("I like the color green.", Language::getText("LanguageTest.a", true));
78-
79+
7980
Language::setLang("en_uk");
8081
$this->assertEquals("I like the colour green.", Language::getText("LanguageTest.a", true));
8182
}
@@ -88,6 +89,6 @@ public function testSetLang()
8889
Language::setLang(null);
8990
$this->assertNull(Language::setLang("en_uk"));
9091
$this->assertEquals("en_uk", Language::setLang("en_us"));
91-
92+
9293
}
9394
}

0 commit comments

Comments
 (0)