diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml new file mode 100644 index 0000000..b6060e6 --- /dev/null +++ b/.github/workflows/qa.yaml @@ -0,0 +1,33 @@ +name: Tests + +on: + pull_request: + push: + branches: + - master + + +jobs: + qa: + strategy: + matrix: + php: [ '7.3','7.4','8.0','8.1','8.2','8.3' ] + runs-on: ubuntu-22.04 + timeout-minutes: 5 + steps: + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: mbstring, intl + coverage: xdebug + tools: composer:v2 + + - uses: actions/checkout@v3 + + - name: Install dependencies + run: composer install --no-interaction + + - name: qa target + run: vendor/bin/phing setup qa diff --git a/README.md b/README.md index fb74843..8fab2b1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Emoji catalog ๐Ÿ“” -Get access to +3600 emojis as class constants. +Get access to +3700 emojis as class constants. Features: @@ -34,8 +34,8 @@ class constants: ## How to install -``` -$ composer require jawira/emoji-catalog +```console +composer require jawira/emoji-catalog ``` ## Emoji sequences diff --git a/build.xml b/build.xml index 4a49581..795c478 100644 --- a/build.xml +++ b/build.xml @@ -2,7 +2,7 @@ - + diff --git a/composer.json b/composer.json index 3a8c839..e515428 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "jawira/emoji-catalog", - "description": "Get access to +3600 emojis as class constants", + "description": "Get access to +3700 emojis as class constants", "license": "MIT", "type": "library", "keywords": [ @@ -15,7 +15,7 @@ "authors": [ { "name": "Jawira Portugal", - "email": "dev@tugal.be" + "homepage": "https://jawira.com/" } ], "require-dev": { diff --git a/docs/catalog.md b/docs/catalog.md index df1e319..db42864 100644 --- a/docs/catalog.md +++ b/docs/catalog.md @@ -61,6 +61,7 @@ This list contains all the _emojis_ from `\Jawira\EmojiCatalog\Emoji`. | sleepy face | ๐Ÿ˜ช | 1F62A | SLEEPY_FACE | | drooling face | ๐Ÿคค | 1F924 | DROOLING_FACE | | sleeping face | ๐Ÿ˜ด | 1F634 | SLEEPING_FACE | +| face with bags under eyes | ๐Ÿซฉ | 1FAE9 | FACE_WITH_BAGS_UNDER_EYES | | face with medical mask | ๐Ÿ˜ท | 1F637 | FACE_WITH_MEDICAL_MASK | | face with thermometer | ๐Ÿค’ | 1F912 | FACE_WITH_THERMOMETER | | face with head-bandage | ๐Ÿค• | 1F915 | FACE_WITH_HEAD_BANDAGE | @@ -1356,12 +1357,12 @@ This list contains all the _emojis_ from `\Jawira\EmojiCatalog\Emoji`. | Mrs. Claus: medium skin tone | ๐Ÿคถ๐Ÿฝ | 1F936 1F3FD | MRS_CLAUS_MEDIUM_SKIN_TONE | | Mrs. Claus: medium-dark skin tone | ๐Ÿคถ๐Ÿพ | 1F936 1F3FE | MRS_CLAUS_MEDIUM_DARK_SKIN_TONE | | Mrs. Claus: dark skin tone | ๐Ÿคถ๐Ÿฟ | 1F936 1F3FF | MRS_CLAUS_DARK_SKIN_TONE | -| mx claus | ๐Ÿง‘โ€๐ŸŽ„ | 1F9D1 200D 1F384 | MX_CLAUS | -| mx claus: light skin tone | ๐Ÿง‘๐Ÿปโ€๐ŸŽ„ | 1F9D1 1F3FB 200D 1F384 | MX_CLAUS_LIGHT_SKIN_TONE | -| mx claus: medium-light skin tone | ๐Ÿง‘๐Ÿผโ€๐ŸŽ„ | 1F9D1 1F3FC 200D 1F384 | MX_CLAUS_MEDIUM_LIGHT_SKIN_TONE | -| mx claus: medium skin tone | ๐Ÿง‘๐Ÿฝโ€๐ŸŽ„ | 1F9D1 1F3FD 200D 1F384 | MX_CLAUS_MEDIUM_SKIN_TONE | -| mx claus: medium-dark skin tone | ๐Ÿง‘๐Ÿพโ€๐ŸŽ„ | 1F9D1 1F3FE 200D 1F384 | MX_CLAUS_MEDIUM_DARK_SKIN_TONE | -| mx claus: dark skin tone | ๐Ÿง‘๐Ÿฟโ€๐ŸŽ„ | 1F9D1 1F3FF 200D 1F384 | MX_CLAUS_DARK_SKIN_TONE | +| Mx Claus | ๐Ÿง‘โ€๐ŸŽ„ | 1F9D1 200D 1F384 | MX_CLAUS | +| Mx Claus: light skin tone | ๐Ÿง‘๐Ÿปโ€๐ŸŽ„ | 1F9D1 1F3FB 200D 1F384 | MX_CLAUS_LIGHT_SKIN_TONE | +| Mx Claus: medium-light skin tone | ๐Ÿง‘๐Ÿผโ€๐ŸŽ„ | 1F9D1 1F3FC 200D 1F384 | MX_CLAUS_MEDIUM_LIGHT_SKIN_TONE | +| Mx Claus: medium skin tone | ๐Ÿง‘๐Ÿฝโ€๐ŸŽ„ | 1F9D1 1F3FD 200D 1F384 | MX_CLAUS_MEDIUM_SKIN_TONE | +| Mx Claus: medium-dark skin tone | ๐Ÿง‘๐Ÿพโ€๐ŸŽ„ | 1F9D1 1F3FE 200D 1F384 | MX_CLAUS_MEDIUM_DARK_SKIN_TONE | +| Mx Claus: dark skin tone | ๐Ÿง‘๐Ÿฟโ€๐ŸŽ„ | 1F9D1 1F3FF 200D 1F384 | MX_CLAUS_DARK_SKIN_TONE | | superhero | ๐Ÿฆธ | 1F9B8 | SUPERHERO | | superhero: light skin tone | ๐Ÿฆธ๐Ÿป | 1F9B8 1F3FB | SUPERHERO_LIGHT_SKIN_TONE | | superhero: medium-light skin tone | ๐Ÿฆธ๐Ÿผ | 1F9B8 1F3FC | SUPERHERO_MEDIUM_LIGHT_SKIN_TONE | @@ -2432,6 +2433,7 @@ This list contains all the _emojis_ from `\Jawira\EmojiCatalog\Emoji`. | family: adult, child | ๐Ÿง‘โ€๐Ÿง’ | 1F9D1 200D 1F9D2 | FAMILY_ADULT_CHILD | | family: adult, child, child | ๐Ÿง‘โ€๐Ÿง’โ€๐Ÿง’ | 1F9D1 200D 1F9D2 200D 1F9D2 | FAMILY_ADULT_CHILD_CHILD | | footprints | ๐Ÿ‘ฃ | 1F463 | FOOTPRINTS | +| fingerprint | ๐Ÿซ† | 1FAC6 | FINGERPRINT | | monkey face | ๐Ÿต | 1F435 | MONKEY_FACE | | monkey | ๐Ÿ’ | 1F412 | MONKEY | | gorilla | ๐Ÿฆ | 1F98D | GORILLA | @@ -2541,6 +2543,11 @@ This list contains all the _emojis_ from `\Jawira\EmojiCatalog\Emoji`. | spiral shell | ๐Ÿš | 1F41A | SPIRAL_SHELL | | coral | ๐Ÿชธ | 1FAB8 | CORAL | | jellyfish | ๐Ÿชผ | 1FABC | JELLYFISH | +| crab | ๐Ÿฆ€ | 1F980 | CRAB | +| lobster | ๐Ÿฆž | 1F99E | LOBSTER | +| shrimp | ๐Ÿฆ | 1F990 | SHRIMP | +| squid | ๐Ÿฆ‘ | 1F991 | SQUID | +| oyster | ๐Ÿฆช | 1F9AA | OYSTER | | snail | ๐ŸŒ | 1F40C | SNAIL | | butterfly | ๐Ÿฆ‹ | 1F98B | BUTTERFLY | | bug | ๐Ÿ› | 1F41B | BUG | @@ -2585,6 +2592,7 @@ This list contains all the _emojis_ from `\Jawira\EmojiCatalog\Emoji`. | empty nest | ๐Ÿชน | 1FAB9 | EMPTY_NEST | | nest with eggs | ๐Ÿชบ | 1FABA | NEST_WITH_EGGS | | mushroom | ๐Ÿ„ | 1F344 | MUSHROOM | +| leafless tree | ๐Ÿชพ | 1FABE | LEAFLESS_TREE | | grapes | ๐Ÿ‡ | 1F347 | GRAPES | | melon | ๐Ÿˆ | 1F348 | MELON | | watermelon | ๐Ÿ‰ | 1F349 | WATERMELON | @@ -2623,6 +2631,7 @@ This list contains all the _emojis_ from `\Jawira\EmojiCatalog\Emoji`. | ginger root | ๐Ÿซš | 1FADA | GINGER_ROOT | | pea pod | ๐Ÿซ› | 1FADB | PEA_POD | | brown mushroom | ๐Ÿ„โ€๐ŸŸซ | 1F344 200D 1F7EB | BROWN_MUSHROOM | +| root vegetable | ๐Ÿซœ | 1FADC | ROOT_VEGETABLE | | bread | ๐Ÿž | 1F35E | BREAD | | croissant | ๐Ÿฅ | 1F950 | CROISSANT | | baguette bread | ๐Ÿฅ– | 1F956 | BAGUETTE_BREAD | @@ -2674,11 +2683,6 @@ This list contains all the _emojis_ from `\Jawira\EmojiCatalog\Emoji`. | dumpling | ๐ŸฅŸ | 1F95F | DUMPLING | | fortune cookie | ๐Ÿฅ  | 1F960 | FORTUNE_COOKIE | | takeout box | ๐Ÿฅก | 1F961 | TAKEOUT_BOX | -| crab | ๐Ÿฆ€ | 1F980 | CRAB | -| lobster | ๐Ÿฆž | 1F99E | LOBSTER | -| shrimp | ๐Ÿฆ | 1F990 | SHRIMP | -| squid | ๐Ÿฆ‘ | 1F991 | SQUID | -| oyster | ๐Ÿฆช | 1F9AA | OYSTER | | soft ice cream | ๐Ÿฆ | 1F366 | SOFT_ICE_CREAM | | shaved ice | ๐Ÿง | 1F367 | SHAVED_ICE | | ice cream | ๐Ÿจ | 1F368 | ICE_CREAM | @@ -3099,6 +3103,7 @@ This list contains all the _emojis_ from `\Jawira\EmojiCatalog\Emoji`. | long drum | ๐Ÿช˜ | 1FA98 | LONG_DRUM | | maracas | ๐Ÿช‡ | 1FA87 | MARACAS | | flute | ๐Ÿชˆ | 1FA88 | FLUTE | +| harp | ๐Ÿช‰ | 1FA89 | HARP | | mobile phone | ๐Ÿ“ฑ | 1F4F1 | MOBILE_PHONE | | mobile phone with arrow | ๐Ÿ“ฒ | 1F4F2 | MOBILE_PHONE_WITH_ARROW | | telephone | โ˜Ž๏ธ | 260E FE0F | TELEPHONE | @@ -3237,6 +3242,7 @@ This list contains all the _emojis_ from `\Jawira\EmojiCatalog\Emoji`. | toolbox | ๐Ÿงฐ | 1F9F0 | TOOLBOX | | magnet | ๐Ÿงฒ | 1F9F2 | MAGNET | | ladder | ๐Ÿชœ | 1FA9C | LADDER | +| shovel | ๐Ÿช | 1FA8F | SHOVEL | | alembic | โš—๏ธ | 2697 FE0F | ALEMBIC | | test tube | ๐Ÿงช | 1F9EA | TEST_TUBE | | petri dish | ๐Ÿงซ | 1F9EB | PETRI_DISH | @@ -3422,6 +3428,7 @@ This list contains all the _emojis_ from `\Jawira\EmojiCatalog\Emoji`. | copyright | ยฉ๏ธ | 00A9 FE0F | COPYRIGHT | | registered | ยฎ๏ธ | 00AE FE0F | REGISTERED | | trade mark | โ„ข๏ธ | 2122 FE0F | TRADE_MARK | +| splatter | ๐ŸซŸ | 1FADF | SPLATTER | | keycap: # | #๏ธโƒฃ | 0023 FE0F 20E3 | KEYCAP_NUMBER | | keycap: * | *๏ธโƒฃ | 002A FE0F 20E3 | KEYCAP_ASTERISK | | keycap: 0 | 0๏ธโƒฃ | 0030 FE0F 20E3 | KEYCAP_0 | @@ -3567,6 +3574,7 @@ This list contains all the _emojis_ from `\Jawira\EmojiCatalog\Emoji`. | flag: China | ๐Ÿ‡จ๐Ÿ‡ณ | 1F1E8 1F1F3 | FLAG_CHINA | | flag: Colombia | ๐Ÿ‡จ๐Ÿ‡ด | 1F1E8 1F1F4 | FLAG_COLOMBIA | | flag: Clipperton Island | ๐Ÿ‡จ๐Ÿ‡ต | 1F1E8 1F1F5 | FLAG_CLIPPERTON_ISLAND | +| flag: Sark | ๐Ÿ‡จ๐Ÿ‡ถ | 1F1E8 1F1F6 | FLAG_SARK | | flag: Costa Rica | ๐Ÿ‡จ๐Ÿ‡ท | 1F1E8 1F1F7 | FLAG_COSTA_RICA | | flag: Cuba | ๐Ÿ‡จ๐Ÿ‡บ | 1F1E8 1F1FA | FLAG_CUBA | | flag: Cape Verde | ๐Ÿ‡จ๐Ÿ‡ป | 1F1E8 1F1FB | FLAG_CAPE_VERDE | diff --git a/src/Emoji.php b/src/Emoji.php index 7c0e5a8..767aeee 100644 --- a/src/Emoji.php +++ b/src/Emoji.php @@ -66,6 +66,7 @@ const PENSIVE_FACE = '๐Ÿ˜”'; const SLEEPY_FACE = '๐Ÿ˜ช'; const DROOLING_FACE = '๐Ÿคค'; const SLEEPING_FACE = '๐Ÿ˜ด'; +const FACE_WITH_BAGS_UNDER_EYES = '๐Ÿซฉ'; const FACE_WITH_MEDICAL_MASK = '๐Ÿ˜ท'; const FACE_WITH_THERMOMETER = '๐Ÿค’'; const FACE_WITH_HEAD_BANDAGE = '๐Ÿค•'; @@ -2402,7 +2403,6 @@ const COUPLE_WITH_HEART_WOMAN_WOMAN_DARK_SKIN_TONE_MEDIUM_LIGHT_SKIN_TONE = ' const COUPLE_WITH_HEART_WOMAN_WOMAN_DARK_SKIN_TONE_MEDIUM_SKIN_TONE = '๐Ÿ‘ฉ๐Ÿฟโ€โค๏ธโ€๐Ÿ‘ฉ๐Ÿฝ'; const COUPLE_WITH_HEART_WOMAN_WOMAN_DARK_SKIN_TONE_MEDIUM_DARK_SKIN_TONE = '๐Ÿ‘ฉ๐Ÿฟโ€โค๏ธโ€๐Ÿ‘ฉ๐Ÿพ'; const COUPLE_WITH_HEART_WOMAN_WOMAN_DARK_SKIN_TONE = '๐Ÿ‘ฉ๐Ÿฟโ€โค๏ธโ€๐Ÿ‘ฉ๐Ÿฟ'; -const FAMILY = '๐Ÿ‘ช'; const FAMILY_MAN_WOMAN_BOY = '๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘ฆ'; const FAMILY_MAN_WOMAN_GIRL = '๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘ง'; const FAMILY_MAN_WOMAN_GIRL_BOY = '๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘งโ€๐Ÿ‘ฆ'; @@ -2432,11 +2432,13 @@ const SPEAKING_HEAD = '๐Ÿ—ฃ๏ธ'; const BUST_IN_SILHOUETTE = '๐Ÿ‘ค'; const BUSTS_IN_SILHOUETTE = '๐Ÿ‘ฅ'; const PEOPLE_HUGGING = '๐Ÿซ‚'; +const FAMILY = '๐Ÿ‘ช'; const FAMILY_ADULT_ADULT_CHILD = '๐Ÿง‘โ€๐Ÿง‘โ€๐Ÿง’'; const FAMILY_ADULT_ADULT_CHILD_CHILD = '๐Ÿง‘โ€๐Ÿง‘โ€๐Ÿง’โ€๐Ÿง’'; const FAMILY_ADULT_CHILD = '๐Ÿง‘โ€๐Ÿง’'; const FAMILY_ADULT_CHILD_CHILD = '๐Ÿง‘โ€๐Ÿง’โ€๐Ÿง’'; const FOOTPRINTS = '๐Ÿ‘ฃ'; +const FINGERPRINT = '๐Ÿซ†'; const MONKEY_FACE = '๐Ÿต'; const MONKEY = '๐Ÿ’'; const GORILLA = '๐Ÿฆ'; @@ -2546,6 +2548,11 @@ const OCTOPUS = '๐Ÿ™'; const SPIRAL_SHELL = '๐Ÿš'; const CORAL = '๐Ÿชธ'; const JELLYFISH = '๐Ÿชผ'; +const CRAB = '๐Ÿฆ€'; +const LOBSTER = '๐Ÿฆž'; +const SHRIMP = '๐Ÿฆ'; +const SQUID = '๐Ÿฆ‘'; +const OYSTER = '๐Ÿฆช'; const SNAIL = '๐ŸŒ'; const BUTTERFLY = '๐Ÿฆ‹'; const BUG = '๐Ÿ›'; @@ -2590,6 +2597,7 @@ const LEAF_FLUTTERING_IN_WIND = '๐Ÿƒ'; const EMPTY_NEST = '๐Ÿชน'; const NEST_WITH_EGGS = '๐Ÿชบ'; const MUSHROOM = '๐Ÿ„'; +const LEAFLESS_TREE = '๐Ÿชพ'; const GRAPES = '๐Ÿ‡'; const MELON = '๐Ÿˆ'; const WATERMELON = '๐Ÿ‰'; @@ -2628,6 +2636,7 @@ const CHESTNUT = '๐ŸŒฐ'; const GINGER_ROOT = '๐Ÿซš'; const PEA_POD = '๐Ÿซ›'; const BROWN_MUSHROOM = '๐Ÿ„โ€๐ŸŸซ'; +const ROOT_VEGETABLE = '๐Ÿซœ'; const BREAD = '๐Ÿž'; const CROISSANT = '๐Ÿฅ'; const BAGUETTE_BREAD = '๐Ÿฅ–'; @@ -2679,11 +2688,6 @@ const DANGO = '๐Ÿก'; const DUMPLING = '๐ŸฅŸ'; const FORTUNE_COOKIE = '๐Ÿฅ '; const TAKEOUT_BOX = '๐Ÿฅก'; -const CRAB = '๐Ÿฆ€'; -const LOBSTER = '๐Ÿฆž'; -const SHRIMP = '๐Ÿฆ'; -const SQUID = '๐Ÿฆ‘'; -const OYSTER = '๐Ÿฆช'; const SOFT_ICE_CREAM = '๐Ÿฆ'; const SHAVED_ICE = '๐Ÿง'; const ICE_CREAM = '๐Ÿจ'; @@ -3104,6 +3108,7 @@ const DRUM = '๐Ÿฅ'; const LONG_DRUM = '๐Ÿช˜'; const MARACAS = '๐Ÿช‡'; const FLUTE = '๐Ÿชˆ'; +const HARP = '๐Ÿช‰'; const MOBILE_PHONE = '๐Ÿ“ฑ'; const MOBILE_PHONE_WITH_ARROW = '๐Ÿ“ฒ'; const TELEPHONE = 'โ˜Ž๏ธ'; @@ -3242,6 +3247,7 @@ const HOOK = '๐Ÿช'; const TOOLBOX = '๐Ÿงฐ'; const MAGNET = '๐Ÿงฒ'; const LADDER = '๐Ÿชœ'; +const SHOVEL = '๐Ÿช'; const ALEMBIC = 'โš—๏ธ'; const TEST_TUBE = '๐Ÿงช'; const PETRI_DISH = '๐Ÿงซ'; @@ -3427,6 +3433,7 @@ const SPARKLE = 'โ‡๏ธ'; const COPYRIGHT = 'ยฉ๏ธ'; const REGISTERED = 'ยฎ๏ธ'; const TRADE_MARK = 'โ„ข๏ธ'; +const SPLATTER = '๐ŸซŸ'; const KEYCAP_NUMBER = '#๏ธโƒฃ'; const KEYCAP_ASTERISK = '*๏ธโƒฃ'; const KEYCAP_0 = '0๏ธโƒฃ'; @@ -3572,6 +3579,7 @@ const FLAG_CAMEROON = '๐Ÿ‡จ๐Ÿ‡ฒ'; const FLAG_CHINA = '๐Ÿ‡จ๐Ÿ‡ณ'; const FLAG_COLOMBIA = '๐Ÿ‡จ๐Ÿ‡ด'; const FLAG_CLIPPERTON_ISLAND = '๐Ÿ‡จ๐Ÿ‡ต'; +const FLAG_SARK = '๐Ÿ‡จ๐Ÿ‡ถ'; const FLAG_COSTA_RICA = '๐Ÿ‡จ๐Ÿ‡ท'; const FLAG_CUBA = '๐Ÿ‡จ๐Ÿ‡บ'; const FLAG_CAPE_VERDE = '๐Ÿ‡จ๐Ÿ‡ป'; @@ -3752,10 +3760,6 @@ const FLAG_TIMOR_LESTE = '๐Ÿ‡น๐Ÿ‡ฑ'; const FLAG_TURKMENISTAN = '๐Ÿ‡น๐Ÿ‡ฒ'; const FLAG_TUNISIA = '๐Ÿ‡น๐Ÿ‡ณ'; const FLAG_TONGA = '๐Ÿ‡น๐Ÿ‡ด'; -/** - * @deprecated Use {@see Emoji::FLAG_TURKIYE} - */ -const FLAG_TURKEY = '๐Ÿ‡น๐Ÿ‡ท'; const FLAG_TURKIYE = '๐Ÿ‡น๐Ÿ‡ท'; const FLAG_TRINIDAD_TOBAGO = '๐Ÿ‡น๐Ÿ‡น'; const FLAG_TUVALU = '๐Ÿ‡น๐Ÿ‡ป'; diff --git a/tests/vanilla.php b/tests/vanilla.php index 007023a..31ffca2 100644 --- a/tests/vanilla.php +++ b/tests/vanilla.php @@ -18,13 +18,14 @@ function vanilla() 'E4.0' => [Emoji::FLAG_UNITED_NATIONS, "\u{1F1FA}\u{1F1F3}"], 'E13.1' => [Emoji::HEART_ON_FIRE, "\u{2764}\u{FE0F}\u{200D}\u{1F525}"], 'E15.0' => [Emoji::PINK_HEART, "\u{1FA77}"], + 'E16.0' => [Emoji::HARP, "\u{1FA89}"], ]; foreach ($provider as $key => $testCase) { if ($testCase[0] !== $testCase[1]) { throw new Exception("Test '$key' failed!"); } - echo $testCase[0]; + echo "OK $testCase[0] \n"; } $count = count($provider); echo PHP_EOL, "All $count tests ok!", PHP_EOL;